|
@@ -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()
|
|
|
|