Skip to content

Commit 1e21492

Browse files
committed
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.
1 parent 6a87094 commit 1e21492

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

cmake/godotcpp.cmake

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,18 +319,20 @@ function(godotcpp_generate)
319319
set(DEBUG_FEATURES "$<NOT:$<STREQUAL:${GODOTCPP_TARGET},template_release>>")
320320
set(HOT_RELOAD "$<IF:${HOT_RELOAD-UNSET},${DEBUG_FEATURES},$<BOOL:${GODOTCPP_USE_HOT_RELOAD}>>")
321321

322-
# Suffix
322+
# Suffix Generator Expression
323323
string(
324324
CONCAT
325-
GODOTCPP_SUFFIX
326-
"$<1:.${SYSTEM_NAME}>"
325+
GODOTCPP_SUFFIX_GENEX
326+
"$<1:${SYSTEM_NAME}>"
327327
"$<1:.${GODOTCPP_TARGET}>"
328328
"$<${IS_DEV_BUILD}:.dev>"
329329
"$<$<STREQUAL:${GODOTCPP_PRECISION},double>:.double>"
330330
"$<1:.${ARCH_NAME}>"
331331
# TODO IOS_SIMULATOR
332332
"$<$<NOT:${THREADS_ENABLED}>:.nothreads>"
333333
)
334+
# The same as above, but with a leading '.' to maintain backwards compatibility.
335+
set(GODOTCPP_SUFFIX ".${GODOT_SUFFIX_GENEX}")
334336

335337
# the godot-cpp.* library targets
336338
add_library(godot-cpp STATIC)
@@ -370,11 +372,12 @@ function(godotcpp_generate)
370372
ARCHIVE_OUTPUT_DIRECTORY "$<1:${CMAKE_BINARY_DIR}/bin>"
371373

372374
# Things that are handy to know for dependent targets
373-
GODOTCPP_PLATFORM "${SYSTEM_NAME}"
374-
GODOTCPP_TARGET "${GODOTCPP_TARGET}"
375-
GODOTCPP_ARCH "${ARCH_NAME}"
376-
GODOTCPP_PRECISION "${GODOTCPP_PRECISION}"
377-
GODOTCPP_SUFFIX "${GODOTCPP_SUFFIX}"
375+
GODOTCPP_PLATFORM "${SYSTEM_NAME}"
376+
GODOTCPP_TARGET "${GODOTCPP_TARGET}"
377+
GODOTCPP_ARCH "${ARCH_NAME}"
378+
GODOTCPP_PRECISION "${GODOTCPP_PRECISION}"
379+
GODOTCPP_SUFFIX "${GODOTCPP_SUFFIX}"
380+
GODOTCPP_SUFFIX_GENEX "${GODOTCPP_SUFFIX_GENEX}"
378381

379382
# Some IDE's respect this property to logically group targets
380383
FOLDER "godot-cpp"

0 commit comments

Comments
 (0)