summaryrefslogtreecommitdiffstats
path: root/cmake/QtPostProcess.cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-05-14 17:02:59 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-05-19 10:16:05 +0200
commitfae09465c7f06819731e54ffc6c63a0614fdfa6f (patch)
tree1993f7b1bc0ff420c336ff7a28c7245388e66bd4 /cmake/QtPostProcess.cmake
parent06b148074a591c333623e387bac8451b3e334af6 (diff)
CMake: Default to building all configurations with Ninja Multi-Config
Thus we will build both Release and Debug configurations in Coin when cmake --build . is executed, mimicking qmake's make which builds both configurations in debug_and_release. Task-number: QTBUG-80900 Change-Id: If48aca249eb84e690d3f9d51a733b3a25df1f7ca Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtPostProcess.cmake')
-rw-r--r--cmake/QtPostProcess.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake
index 6d3c4cd240..d1db4686b8 100644
--- a/cmake/QtPostProcess.cmake
+++ b/cmake/QtPostProcess.cmake
@@ -381,7 +381,6 @@ function(qt_generate_build_internals_extra_cmake_code)
if(QT_BUILD_STANDALONE_TESTS)
set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\" FORCE)
endif()\n")
- string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "${multi_config_specific}")
endif()
if(CMAKE_CROSS_CONFIGS)
@@ -392,6 +391,10 @@ endif()\n")
string(APPEND ninja_multi_config_specific
" set(CMAKE_DEFAULT_BUILD_TYPE \"${CMAKE_DEFAULT_BUILD_TYPE}\" CACHE STRING \"\")\n")
endif()
+ if(CMAKE_DEFAULT_CONFIGS)
+ string(APPEND ninja_multi_config_specific
+ " set(CMAKE_DEFAULT_CONFIGS \"${CMAKE_DEFAULT_CONFIGS}\" CACHE STRING \"\")\n")
+ endif()
if(ninja_multi_config_specific)
qt_wrap_string_in_if_ninja_multi_config(
"${ninja_multi_config_specific}"