From 98f61735166d4bf1792ac22a688fe83f09bc5bd7 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 5 Dec 2022 22:21:21 +0200 Subject: [PATCH] BUILD_SINGLE_APP is now CMake option --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb862f887..0726c6b2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,10 +33,6 @@ if(APPLE) endif() endif() -if(APPLE_IOS) - set(BUILD_SINGLE_APP 1) -endif() - ############################################ # User-provided options # ############################################ @@ -64,6 +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) # Used for Snap packages and also useful for debugging if(NOT APPLE_IOS) @@ -74,6 +71,10 @@ 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) +endif() + # ERM depends on LUA implicitly if(ENABLE_ERM AND NOT ENABLE_LUA) set(ENABLE_LUA ON)