summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-09 13:37:41 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-09 23:09:12 +0100
commitd0400b1cb853f0287269045d6170b47644c33b44 (patch)
tree2e8f26f05498f1dd93933ded65ae34ed69de8d3e
parent28fff4a5519c8e1068450a052cb19fb2149e9726 (diff)
CMake: Disable framework builds on macOS when target config is Debug
This prevents Coin from trying to automatically enable the framework feature when no configuration is specified on the command line. By default if no configuration is specified, and there's a .git subfolder, "Debug" will be the chosen config, and that would conflict with the framework feature, which would cause configuration to fail. Change-Id: Ia9db3e8178794737692307b4662a2e77cc574ccd Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--configure.cmake2
-rwxr-xr-xutil/cmake/configurejson2cmake.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake
index c70d1892aa..6458264a61 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -399,7 +399,7 @@ qt_feature("headersclean"
qt_feature_config("headersclean" QMAKE_PRIVATE_CONFIG)
qt_feature("framework" PUBLIC
LABEL "Build Apple Frameworks"
- CONDITION APPLE AND BUILD_SHARED_LIBS
+ CONDITION APPLE AND BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
)
qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD")
qt_feature_config("framework" QMAKE_PUBLIC_QT_CONFIG
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 390042760b..0966a42932 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -778,7 +778,7 @@ def get_feature_mapping():
"force_debug_info": {
"autoDetect": "CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo OR RelWithDebInfo IN_LIST CMAKE_CONFIGURATION_TYPES"
},
- "framework": {"condition": "APPLE AND BUILD_SHARED_LIBS"},
+ "framework": {"condition": "APPLE AND BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE STREQUAL Debug"},
"gc_binaries": None,
"gcc-sysroot": None,
"gcov": None,