From a0e649c0eb785b720742319483028cc66e094aaa Mon Sep 17 00:00:00 2001 From: Christian Daniel Jensen Date: Mon, 2 Nov 2026 05:02:22 -0700 Subject: [PATCH] Route client and server build/install assets to native Continuumatrice product paths --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b9d87a03..e7e83003c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ if(WITH_ORACLE) message(FATAL_ERROR "The upstream Oracle importer fetches Magic data and cannot be distributed as Continuumatrice. Build with -DWITH_ORACLE=OFF; use your own card XML.") endif() # Compile Servatrice -option(WITH_SERVER "Build Continuumatrice-compatible server" OFF) +option(WITH_SERVER "Build Continuum-Servatrice dedicated multiplayer server" ON) # Compile tests option(TEST "Build tests" OFF) # Build with AddressSanitizer and UndefinedBehaviorSanitizer @@ -443,12 +443,15 @@ if(WITH_CLIENT) endif() if(WITH_SERVER) - add_subdirectory(servatrice) - set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) + # Keep the inherited source tree stable while generating the native product + # build directory. The compiled program is build/continuum-servatrice/continuum-servatrice. + add_subdirectory(servatrice "${CMAKE_BINARY_DIR}/continuum-servatrice") + set(CPACK_INSTALL_CMAKE_PROJECTS "ContinuumServatrice;ContinuumServatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) endif() if(WITH_CLIENT) - add_subdirectory(cockatrice) + # Source directory keeps its history; output no longer inherits "cockatrice". + add_subdirectory(cockatrice "${CMAKE_BINARY_DIR}/continuumatrice") set(CPACK_INSTALL_CMAKE_PROJECTS "Continuumatrice;Continuumatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) endif()