diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-03-06 09:28:12 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-03-06 13:38:13 +0100 |
| commit | a3d0ef019a2a592d55035adc784d5d0475f39a74 (patch) | |
| tree | 0fbf38828aa34c28933c3d2748ebf971791151f4 | |
| parent | b4f19e427775311c769f3a29864f9ad72ee2d791 (diff) | |
CMake: Fix condition of the 'debug' feature
For the moment, in feature conditions that use STREQUAL, the lhs must be
a variable.
Change-Id: I56fe24baeb8067662ea81984fd48383da4c5b67b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | configure.cmake | 2 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake index 9610d37576..2fc01379fa 100644 --- a/configure.cmake +++ b/configure.cmake @@ -354,7 +354,7 @@ qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG qt_feature("debug" LABEL "Build for debugging" AUTODETECT QT_FEATURE_developer_build OR ( WIN32 AND NOT GCC ) OR APPLE - CONDITION Debug STREQUAL CMAKE_BUILD_TYPE 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 LABEL "Compile libs in debug and release mode" diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index f0fb4f0817..b024c76459 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -771,7 +771,7 @@ def parseFeature(ctx, feature, data, cm_fh): "autoDetect": "1", # Setting this to None has weird effects... "condition": "QT_GENERATOR_IS_MULTI_CONFIG" }, - "debug": {"condition": "Debug STREQUAL CMAKE_BUILD_TYPE OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"}, + "debug": {"condition": "CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"}, "dlopen": {"condition": "UNIX"}, "doubleconversion": None, "enable_gdb_index": None, |