From becbd07f5529c88bf460f51e8ec5475ec8575fb7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 26 Feb 2020 12:53:30 +0100 Subject: [PATCH] CMake: Port the 'debug' feature This feature is read-only and supposed to be set by variables like CMAKE_BUILD_TYPE. It mainly exists for the qmake support. Change-Id: Ic7e32cbda0f3c2d92dd446b07a3bf1a8d85ec3b9 Reviewed-by: Alexandru Croitor --- configure.cmake | 5 +++++ util/cmake/configurejson2cmake.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake index 45f5ba0ef4b..3cd0e8cf95b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -344,6 +344,11 @@ qt_feature_definition("developer-build" "QT_BUILD_INTERNAL") qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG NAME "private_tests" ) +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 +) qt_feature("appstore-compliant" PUBLIC LABEL "App store compliance" PURPOSE "Disables code that is not allowed in platform app stores" diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 8e252703491..8101697a559 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -701,7 +701,7 @@ def parseFeature(ctx, feature, data, cm_fh): "compiler-flags": None, "cross_compile": None, "debug_and_release": None, - "debug": None, + "debug": {"condition": "Debug STREQUAL CMAKE_BUILD_TYPE OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"}, "dlopen": {"condition": "UNIX"}, "doubleconversion": None, "enable_gdb_index": None,