From aa5e43d49169fce27821c1296a0c80966786c138 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 2 Mar 2020 14:16:38 +0100 Subject: [PATCH] CMake: Adapt to latest upstream Ninja Multi-Config changes Most of the NMC-specific variables were renamed to be more general. Change-Id: I8ee2874fecb9e57480ce51db9183c6cf3dd100af Reviewed-by: Leander Beernaert Reviewed-by: Joerg Bornemann --- cmake/QtAutoDetect.cmake | 4 ++-- cmake/QtPostProcess.cmake | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 936d9fdfa8a..0929989b180 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -167,8 +167,8 @@ function(qt_auto_detect_cmake_config) set(CMAKE_TRY_COMPILE_CONFIGURATION "${QT_MULTI_CONFIG_FIRST_CONFIG}" PARENT_SCOPE) if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config") - set(CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE ON PARENT_SCOPE) - set(CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE "${QT_MULTI_CONFIG_FIRST_CONFIG}" PARENT_SCOPE) + set(CMAKE_CROSS_CONFIGS "all" CACHE STRING "") + set(CMAKE_DEFAULT_BUILD_TYPE "${QT_MULTI_CONFIG_FIRST_CONFIG}" CACHE STRING "") endif() endif() endfunction() diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake index e8e6c2b3aa2..65abd5f6354 100644 --- a/cmake/QtPostProcess.cmake +++ b/cmake/QtPostProcess.cmake @@ -319,7 +319,7 @@ function(qt_generate_build_internals_extra_cmake_code) endif() if(CMAKE_CONFIGURATION_TYPES) string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS - "set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\")\n") + "set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\" FORCE)\n") endif() if(CMAKE_TRY_COMPILE_CONFIGURATION) string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS @@ -329,13 +329,13 @@ function(qt_generate_build_internals_extra_cmake_code) string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "set(QT_MULTI_CONFIG_FIRST_CONFIG \"${QT_MULTI_CONFIG_FIRST_CONFIG}\")\n") endif() - if(CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE) + if(CMAKE_CROSS_CONFIGS) string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS - "set(CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE \"${CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE}\")\n") + "set(CMAKE_CROSS_CONFIGS \"${CMAKE_CROSS_CONFIGS}\" CACHE STRING \"\")\n") endif() - if(CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE) + if(CMAKE_DEFAULT_BUILD_TYPE) string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS - "set(CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE \"${CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE}\")\n") + "set(CMAKE_DEFAULT_BUILD_TYPE \"${CMAKE_DEFAULT_BUILD_TYPE}\" CACHE STRING \"\")\n") endif() configure_file(