summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-08-21 15:16:31 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-08-23 11:04:55 +0200
commit4306fc019ad88b124cd1af0998a3bcc60856fc74 (patch)
tree5e4c50df4c9213a1cc36d2873e4664a2b584e1d1 /util
parent97551b90b974f943ff3fac40314c79ef922596d3 (diff)
CMake: Fix detection of the 'debug' feature
The debug feature for the CMake build is solely determined by the value of CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES. There is no point in restricting the autoDetect expression to developer builds or MSVC and macOS builds. User-visible result: -DCMAKE_BUILD_TYPE=Debug now actually turns the 'debug' feature on, also for non-developer builds on Linux. Change-Id: I65c92575c9483bff16beb78b60606c55aeadcece Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
-rwxr-xr-xutil/cmake/configurejson2cmake.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 8b74cf53cb..7fa19166d5 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -893,6 +893,7 @@ def get_feature_mapping():
"condition": "QT_GENERATOR_IS_MULTI_CONFIG",
},
"debug": {
+ "autoDetect": "ON",
"condition": "CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"
},
"dlopen": {"condition": "UNIX"},