From b64b941adf63b22d9040aab4f1fa9502079f3ad9 Mon Sep 17 00:00:00 2001 From: Samuel Nicholas Date: Tue, 8 Jul 2025 15:28:33 +0930 Subject: [PATCH] CMake: Add GODOTCPP_SUFFIX_GENEX variable This is the same as GODOTCPP_SUFFIX but without the leading '.' GODOTCPP_SUFFIX is then based on the above. --- cmake/godotcpp.cmake | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cmake/godotcpp.cmake b/cmake/godotcpp.cmake index a0c544fc4..7c4ea686b 100644 --- a/cmake/godotcpp.cmake +++ b/cmake/godotcpp.cmake @@ -319,11 +319,11 @@ function(godotcpp_generate) set(DEBUG_FEATURES "$>") set(HOT_RELOAD "$>") - # Suffix + # Suffix Generator Expression string( CONCAT - GODOTCPP_SUFFIX - "$<1:.${SYSTEM_NAME}>" + GODOTCPP_SUFFIX_GENEX + "$<1:${SYSTEM_NAME}>" "$<1:.${GODOTCPP_TARGET}>" "$<${IS_DEV_BUILD}:.dev>" "$<$:.double>" @@ -331,6 +331,8 @@ function(godotcpp_generate) # TODO IOS_SIMULATOR "$<$:.nothreads>" ) + # The same as above, but with a leading '.' to maintain backwards compatibility. + set(GODOTCPP_SUFFIX ".${GODOTCPP_SUFFIX_GENEX}") # the godot-cpp.* library targets add_library(godot-cpp STATIC) @@ -370,11 +372,12 @@ function(godotcpp_generate) ARCHIVE_OUTPUT_DIRECTORY "$<1:${CMAKE_BINARY_DIR}/bin>" # Things that are handy to know for dependent targets - GODOTCPP_PLATFORM "${SYSTEM_NAME}" - GODOTCPP_TARGET "${GODOTCPP_TARGET}" - GODOTCPP_ARCH "${ARCH_NAME}" - GODOTCPP_PRECISION "${GODOTCPP_PRECISION}" - GODOTCPP_SUFFIX "${GODOTCPP_SUFFIX}" + GODOTCPP_PLATFORM "${SYSTEM_NAME}" + GODOTCPP_TARGET "${GODOTCPP_TARGET}" + GODOTCPP_ARCH "${ARCH_NAME}" + GODOTCPP_PRECISION "${GODOTCPP_PRECISION}" + GODOTCPP_SUFFIX "${GODOTCPP_SUFFIX}" + GODOTCPP_SUFFIX_GENEX "${GODOTCPP_SUFFIX_GENEX}" # Some IDE's respect this property to logically group targets FOLDER "godot-cpp"