jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 05:20:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Restore native Continuumatrice and Continuum-Servatrice CMake targets

Browse source
This commit is contained in:
Christian Daniel Jensen 2026-11-03 19:04:09 -07:00
parent dfb4429ece
commit 7de50eb739
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
CMakeLists.txt
View file

@ -15,11 +15,14 @@ option(WARNING_AS_ERROR "Treat warnings as errors in debug builds" ON)
# Check for translation updates # Check for translation updates
option(UPDATE_TRANSLATIONS "Update translations on compile" OFF) option(UPDATE_TRANSLATIONS "Update translations on compile" OFF)
# Compile Cockatrice # Compile Cockatrice
option(WITH_CLIENT "Build Cockatrice client" ON) option(WITH_CLIENT "Build Continuumatrice client" ON)
# Compile Oracle # Compile Oracle
option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON) option(WITH_ORACLE "Build legacy upstream Magic-card Oracle importer (not Continuumatrice data)" OFF)
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 # Compile Servatrice
option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF) option(WITH_SERVER "Build Continuum-Servatrice dedicated multiplayer server" ON)
# Compile tests # Compile tests
option(TEST "Build tests" OFF) option(TEST "Build tests" OFF)
# Build with AddressSanitizer and UndefinedBehaviorSanitizer # Build with AddressSanitizer and UndefinedBehaviorSanitizer
@ -92,7 +95,7 @@ endif()
# A project name is needed for CPack # A project name is needed for CPack
# Version can be overriden by git tags, see cmake/getversion.cmake # Version can be overriden by git tags, see cmake/getversion.cmake
project("Cockatrice" VERSION 3.2.0) project("Continuumatrice" VERSION 3.2.0)
# Set release name if not provided via env/cmake var # Set release name if not provided via env/cmake var
if(NOT DEFINED GIT_TAG_RELEASENAME) if(NOT DEFINED GIT_TAG_RELEASENAME)
@ -293,17 +296,17 @@ if(MSVC)
endif() endif()
# Package builder # Package builder
set(CPACK_PACKAGE_CONTACT "Zach Halpern <zach@cockatrice.us>") set(CPACK_PACKAGE_CONTACT "Continuum Universes Studio")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
set(CPACK_PACKAGE_VENDOR "Cockatrice Development Team") set(CPACK_PACKAGE_VENDOR "Continuum Universes Studio")
set(CPACK_PACKAGE_DESCRIPTION set(CPACK_PACKAGE_DESCRIPTION
"Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline." "Continuumatrice is the Continuum Universes card-game client, independently packaged from the upstream Cockatrice project. It supports local games and compatible multiplayer servers."
) )
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_VERSION_FILENAME}") set(CPACK_PACKAGE_FILE_NAME "Continuumatrice-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}")
if(UNIX) if(UNIX)
if(APPLE) if(APPLE)
@ -320,10 +323,10 @@ if(UNIX)
# linux # linux
if(CPACK_GENERATOR STREQUAL "RPM") if(CPACK_GENERATOR STREQUAL "RPM")
set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
set(CPACK_RPM_MAIN_COMPONENT "cockatrice") set(CPACK_RPM_MAIN_COMPONENT "continuumatrice")
set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, qt6-qttools") set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, qt6-qttools")
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games") set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
set(CPACK_RPM_PACKAGE_URL "http://github.com/Cockatrice/Cockatrice") set(CPACK_RPM_PACKAGE_URL "https://github.com/Continuum-Universes-Studio/Continuumatrice")
# stop directories from making package conflicts # stop directories from making package conflicts
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
/usr/share/applications /usr/share/applications
@ -338,7 +341,7 @@ if(UNIX)
set(CPACK_GENERATOR DEB) set(CPACK_GENERATOR DEB)
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_SECTION "games") set(CPACK_DEBIAN_PACKAGE_SECTION "games")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/Continuum-Universes-Studio/Continuumatrice")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-image-formats-plugins, qt6-qpa-plugins") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-image-formats-plugins, qt6-qpa-plugins")
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
endif() endif()
@ -370,7 +373,7 @@ elseif(WIN32)
# All three applications are packaged into the same directory on Windows, so # All three applications are packaged into the same directory on Windows, so
# this is the union of their Qt module lists, not just the client's: Servatrice # this is the union of their Qt module lists, not just the client's: Servatrice
# contributes Qt6Sql.dll and Oracle contributes nothing the client lacks, and a # contributes Qt6Sql.dll and Oracle contributes nothing the client lacks, and a
# client-only manifest leaves Qt6Sql.dll unasserted even though servatrice.exe # client-only manifest leaves Qt6Sql.dll unasserted even though continuum-servatrice.exe
# is installed next to cockatrice.exe and cannot start without it. # is installed next to cockatrice.exe and cannot start without it.
# #
# A statically linked Qt module ships no runtime DLL, so requiring one would # A statically linked Qt module ships no runtime DLL, so requiring one would
@ -442,13 +445,16 @@ if(WITH_CLIENT)
endif() endif()
if(WITH_SERVER) if(WITH_SERVER)
add_subdirectory(servatrice) # Keep the inherited source tree stable while generating the native product
set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) # 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() endif()
if(WITH_CLIENT) if(WITH_CLIENT)
add_subdirectory(cockatrice) # Source directory keeps its history; output no longer inherits "cockatrice".
set(CPACK_INSTALL_CMAKE_PROJECTS "Cockatrice;Cockatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) add_subdirectory(cockatrice "${CMAKE_BINARY_DIR}/continuumatrice")
set(CPACK_INSTALL_CMAKE_PROJECTS "Continuumatrice;Continuumatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
endif() endif()
if(WIN32 AND WITH_CLIENT) if(WIN32 AND WITH_CLIENT)