diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-09 13:37:41 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-09 23:09:12 +0100 |
| commit | d0400b1cb853f0287269045d6170b47644c33b44 (patch) | |
| tree | 2e8f26f05498f1dd93933ded65ae34ed69de8d3e /util | |
| parent | 28fff4a5519c8e1068450a052cb19fb2149e9726 (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>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |