summaryrefslogtreecommitdiffstats
path: root/util/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'util/cmake')
-rwxr-xr-xutil/cmake/configurejson2cmake.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 135d26b9bf..2c65703d59 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -700,7 +700,10 @@ def parseFeature(ctx, feature, data, cm_fh):
"ccache": None,
"compiler-flags": None,
"cross_compile": None,
- "debug_and_release": None,
+ "debug_and_release": {
+ "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"},
"dlopen": {"condition": "UNIX"},
"doubleconversion": None,