From f26f7d22260b85ea4d0d6044dc2c410ad1da8a20 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 21 Dec 2020 23:31:20 +0100 Subject: [PATCH] CMake: Fix CMAKE_CONFIGURATION_TYPES not being set properly in the cache --- CMakeLists.txt | 1 + dtool/Config.cmake | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c50cbdc58a..26cf644c17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,7 @@ endif() if(IS_MULTICONFIG) message(STATUS "Using multi-configuration generator") + set(CMAKE_CONFIGURATION_TYPES "${_configs}" CACHE STRING "") else() # Set the default CMAKE_BUILD_TYPE before calling project(). if(NOT CMAKE_BUILD_TYPE) diff --git a/dtool/Config.cmake b/dtool/Config.cmake index 95c8b844d4..3a19fb90ad 100644 --- a/dtool/Config.cmake +++ b/dtool/Config.cmake @@ -29,10 +29,6 @@ if(DEFINED CMAKE_CXX_FLAGS_COVERAGE) list(APPEND _configs Coverage) endif() -if(IS_MULTICONFIG) - set(CMAKE_CONFIGURATION_TYPES ${_configs}) -endif() - # Are we building with static or dynamic linking? option(BUILD_SHARED_LIBS "Causes subpackages to be built separately -- setup for dynamic linking.