games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Renamed for consistency BUILD_SINGLE_APP -> ENABLE_SINGLE_APP_BUILD

Browse Source
This commit is contained in:
Ivan Savenko
2022-12-06 00:00:56 +02:00
parent d2702a8fcd
commit fa23965d0b
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -60,7 +60,7 @@ endif(NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0")
option(ENABLE_GITVERSION "Enable Version.cpp with Git commit hash" ON)
option(ENABLE_DEBUG_CONSOLE "Enable debug console for Windows builds" ON)
option(ENABLE_MULTI_PROCESS_BUILDS "Enable /MP flag for MSVS solution" ON)
option(BUILD_SINGLE_APP "Builds client and server as single executable" OFF)
option(ENABLE_SINGLE_APP_BUILD "Builds client and server as single executable" OFF)
# Used for Snap packages and also useful for debugging
if(NOT APPLE_IOS)
@@ -71,8 +71,8 @@ endif()
set(PACKAGE_NAME_SUFFIX "" CACHE STRING "Suffix for CPack package name")
set(PACKAGE_FILE_NAME "" CACHE STRING "Override for CPack package filename")
if(APPLE_IOS AND NOT BUILD_SINGLE_APP)
set(BUILD_SINGLE_APP ON)
if(APPLE_IOS AND NOT ENABLE_SINGLE_APP_BUILD)
set(ENABLE_SINGLE_APP_BUILD ON)
endif()
# ERM depends on LUA implicitly
@@ -168,7 +168,7 @@ set(CMAKE_XCODE_ATTRIBUTE_MARKETING_VERSION ${APP_SHORT_VERSION})
set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH NO)
set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] YES)
if(BUILD_SINGLE_APP)
if(ENABLE_SINGLE_APP_BUILD)
add_compile_definitions(SINGLE_PROCESS_APP=1)
endif()
@@ -430,7 +430,7 @@ endif()
include(VCMI_lib)
add_subdirectory(lib)
set(VCMI_LIB_TARGET vcmi)
if(BUILD_SINGLE_APP)
if(ENABLE_SINGLE_APP_BUILD)
add_subdirectory(lib_server)
endif()

2
client/CMakeLists.txt
View File

@@ -243,7 +243,7 @@ elseif(APPLE_IOS)
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-e,_client_main")
endif()
if(BUILD_SINGLE_APP)
if(ENABLE_SINGLE_APP_BUILD)
target_link_libraries(vcmiclient PRIVATE vcmiserver)
if(ENABLE_LAUNCHER)
target_link_libraries(vcmiclient PRIVATE vcmilauncher)

2
launcher/CMakeLists.txt
View File

@@ -91,7 +91,7 @@ if(WIN32)
set(launcher_ICON VCMI_launcher.rc)
endif()
if(BUILD_SINGLE_APP)
if(ENABLE_SINGLE_APP_BUILD)
add_library(vcmilauncher STATIC ${launcher_SRCS} ${launcher_HEADERS} ${launcher_UI_HEADERS})
else()
add_executable(vcmilauncher WIN32 ${launcher_SRCS} ${launcher_HEADERS} ${launcher_UI_HEADERS} ${launcher_ICON})

2
lib/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_main_lib(vcmi SHARED)
if(BUILD_SINGLE_APP)
if(ENABLE_SINGLE_APP_BUILD)
target_compile_definitions(vcmi PUBLIC VCMI_LIB_NAMESPACE=LIB_CLIENT)
endif()

4
server/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ if(ANDROID) # android needs client/server to be libraries, not executables, so w
return()
endif()
if(BUILD_SINGLE_APP)
if(ENABLE_SINGLE_APP_BUILD)
add_library(vcmiserver STATIC ${server_SRCS} ${server_HEADERS})
set(server_LIBS vcmi_lib_server)
else()
@@ -50,6 +50,6 @@ endif()
vcmi_set_output_dir(vcmiserver "")
enable_pch(vcmiserver)
if(NOT BUILD_SINGLE_APP)
if(NOT ENABLE_SINGLE_APP_BUILD)
install(TARGETS vcmiserver DESTINATION ${BIN_DIR})
endif()