From 1dd25181a9950e6f8f8219a6de20ee37297bf7e4 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 6 Nov 2022 02:29:54 -0800 Subject: [PATCH] cmake: use SRB2_SDL2_EXE_NAME, append git branch, add SRB2_SDL2_EXE_SUFFIX --- CMakeLists.txt | 11 +++++++++++ src/sdl/CMakeLists.txt | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dc38d525..98bf78c51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,6 +129,7 @@ set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") # Set EXE names so the assets CMakeLists can refer to its target set(SRB2_SDL2_EXE_NAME ringracers CACHE STRING "Executable binary output name") +set(SRB2_SDL2_EXE_SUFFIX "" CACHE STRING "Optional executable suffix, separated by an underscore") include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) @@ -145,3 +146,13 @@ git_working_tree_dirty(SRB2_COMP_UNCOMMITTED "${CMAKE_SOURCE_DIR}") set(SRB2_COMP_BRANCH "${SRB2_GIT_BRANCH}") set(SRB2_COMP_REVISION "${SRB2_COMP_COMMIT}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h) + + +list(APPEND EXE_NAME_PARTS ${SRB2_SDL2_EXE_NAME}) +if(NOT "${SRB2_GIT_BRANCH}" STREQUAL "master") + list(APPEND EXE_NAME_PARTS ${SRB2_GIT_BRANCH}) +endif() +list(APPEND EXE_NAME_PARTS ${SRB2_SDL2_EXE_SUFFIX}) + +list(JOIN EXE_NAME_PARTS "_" EXE_NAME) +set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME ${EXE_NAME}) diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index da3c650b6..dd8d304a4 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -31,14 +31,6 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) ) endif() -if("${CMAKE_SYSTEM_NAME}" MATCHES Windows) - set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2win) -elseif("${CMAKE_SYSTEM_NAME}" MATCHES Linux) - set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsdlsrb2) -else() - set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2) -endif() - if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) find_library(CORE_FOUNDATION_LIBRARY "CoreFoundation") target_link_libraries(SRB2SDL2 PRIVATE