1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix detection of the 'debug' feature

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-08-21 15:16:31 +02:00
parent 97551b90b9
commit 4306fc019a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.cmake
View File

@ -452,7 +452,7 @@ qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG
) )
qt_feature("debug" qt_feature("debug"
LABEL "Build for debugging" LABEL "Build for debugging"
AUTODETECT QT_FEATURE_developer_build OR ( WIN32 AND NOT GCC ) OR APPLE AUTODETECT ON
CONDITION CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES CONDITION CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES
) )
qt_feature("debug_and_release" PUBLIC qt_feature("debug_and_release" PUBLIC

1
util/cmake/configurejson2cmake.py
View File

@ -893,6 +893,7 @@ def get_feature_mapping():
"condition": "QT_GENERATOR_IS_MULTI_CONFIG", "condition": "QT_GENERATOR_IS_MULTI_CONFIG",
}, },
"debug": { "debug": {
"autoDetect": "ON",
"condition": "CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES" "condition": "CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"
}, },
"dlopen": {"condition": "UNIX"}, "dlopen": {"condition": "UNIX"},