diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 09:50:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 18:41:35 +0200 |
| commit | 7e03bc39b8bcdaa4e83e72ac99e117561c124951 (patch) | |
| tree | f0868935cfefc6ca18963f9527ea91ce40c419fd /util | |
| parent | 29ad4f8c09d09fc0170f0395eef9503b521ec203 (diff) | |
CMake: Improve sanitizer detection
The change fixes the labels to show up correctly in the configure
summary.
It also allows enabling the sanitizer via the feature flags, e.g.
-DFEATURE_sanitize_address=ON.
Finally the qtbase sanitizer option is saved in QtBuildInternalsExtra
so that repos built after qtbase have the same sanitizer options
enabled.
Change-Id: Ic9d9e3ce3c7ebbc244ced2e6d163d1ac8ee06b12
Fixes: QTBUG-84721
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index ce032fafaf..8b2c51cfe9 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -903,11 +903,7 @@ def get_feature_mapping(): "autoDetect": "1", "condition": "BUILD_SHARED_LIBS AND UNIX AND NOT WIN32 AND NOT ANDROID", }, - "sanitize_address": None, # sanitizer - "sanitize_memory": None, - "sanitizer": None, - "sanitize_thread": None, - "sanitize_undefined": None, + "shared": { "condition": "BUILD_SHARED_LIBS", "output": [ |