From e61eb9b701afdec7b45ad82efc38f2b434712ecc Mon Sep 17 00:00:00 2001 From: fuzzard Date: Fri, 30 Sep 2022 15:21:01 +1000 Subject: [cmake] BUILD_DEP_TARGET macro: Support RelwithDebInfo --- cmake/scripts/common/ModuleHelpers.cmake | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake index e9657cea1e..c512e9558f 100644 --- a/cmake/scripts/common/ModuleHelpers.cmake +++ b/cmake/scripts/common/ModuleHelpers.cmake @@ -240,19 +240,15 @@ macro(BUILD_DEP_TARGET) unset(${MODULE}_LIBRARY_RELEASE) endif() else() - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20") - list(APPEND CMAKE_ARGS "-DCMAKE_BUILD_TYPE=$,Debug,Release>") + # single config generator (ie Make, Ninja) + if(CMAKE_BUILD_TYPE) + list(APPEND CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") else() - # single config generator (ie Make, Ninja) - if(CMAKE_BUILD_TYPE) - list(APPEND CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") - else() - # Multi-config generators (eg VS, Xcode, Ninja Multi-Config) will not have CMAKE_BUILD_TYPE - # Use config genex to generate the types - # Potential issue if Build type isnt supported by lib project - # eg lib supports Debug/Release, however users selects RelWithDebInfo in project - list(APPEND CMAKE_ARGS "-DCMAKE_BUILD_TYPE=$") - endif() + # Multi-config generators (eg VS, Xcode, Ninja Multi-Config) will not have CMAKE_BUILD_TYPE + # Use config genex to generate the types + # Potential issue if Build type isnt supported by lib project + # eg lib supports Debug/Release, however users selects RelWithDebInfo in project + list(APPEND CMAKE_ARGS "-DCMAKE_BUILD_TYPE=$") endif() endif() -- cgit v1.2.3