From aa5e43d49169fce27821c1296a0c80966786c138 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 2 Mar 2020 14:16:38 +0100 Subject: 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmake/QtAutoDetect.cmake') diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 936d9fdfa8..0929989b18 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() -- cgit v1.2.3