From de9adf54457cd3b75e7031076b8c57049e19ff8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 29 May 2017 22:13:46 +0200 Subject: [PATCH] Allow building headless version as a separate target --- CMakeLists.txt | 8 ++------ src/openrct2-cli/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6852a0e482..df831b8f11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/do set(TITLE_SEQUENCE_SHA1 "79ffb2585d12abcbfce205d7696e3472a504b005") option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.") -option(CLI_ONLY "CLI only build of OpenRCT2") option(WITH_TESTS "Build tests") # Define current git branch @@ -49,11 +48,8 @@ endif() # Include sub-projects include("${ROOT_DIR}/src/openrct2/CMakeLists.txt" NO_POLICY_SCOPE) -if (CLI_ONLY) - include("${ROOT_DIR}/src/openrct2-cli/CMakeLists.txt" NO_POLICY_SCOPE) -else () - include("${ROOT_DIR}/src/openrct2-ui/CMakeLists.txt" NO_POLICY_SCOPE) -endif () +include("${ROOT_DIR}/src/openrct2-cli/CMakeLists.txt" NO_POLICY_SCOPE) +include("${ROOT_DIR}/src/openrct2-ui/CMakeLists.txt" NO_POLICY_SCOPE) # g2 add_custom_command( diff --git a/src/openrct2-cli/CMakeLists.txt b/src/openrct2-cli/CMakeLists.txt index 3966b7f05b..0048c68909 100644 --- a/src/openrct2-cli/CMakeLists.txt +++ b/src/openrct2-cli/CMakeLists.txt @@ -18,9 +18,9 @@ file(GLOB_RECURSE OPENRCT2_CLI_SOURCES "${CMAKE_CURRENT_LIST_DIR}/*.hpp") # Outputs -set (PROJECT openrct2) +set (PROJECT openrct2-cli) project(${PROJECT}) -add_executable(${PROJECT} ${OPENRCT2_CLI_SOURCES}) +add_executable(${PROJECT} EXCLUDE_FROM_ALL ${OPENRCT2_CLI_SOURCES}) target_link_libraries(${PROJECT} "libopenrct2")