From 46a2366d12839e009e6010c584ce73e6af04fdbe Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 26 Feb 2020 13:23:05 +0100 Subject: CMake: Port the 'debug_and_release' feature This feature is read-only. It's controlled by the multi-config feature of CMake. It mainly exists for the qmake support. Change-Id: I322459598fe92568eda4d42319ded444537e95d4 Reviewed-by: Alexandru Croitor --- util/cmake/configurejson2cmake.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'util/cmake/configurejson2cmake.py') 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, -- cgit v1.2.3