mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-21 00:55:09 -07:00
updates
This commit is contained in:
parent
fd82b140a8
commit
4ba06597f9
23 changed files with 57 additions and 14 deletions
|
|
@ -1,9 +1,12 @@
|
||||||
# CMakeLists for cockatrice directory
|
# CMakeLists for "cockatrice" directory
|
||||||
#
|
#
|
||||||
# provides the cockatrice binary
|
# Provides the Cockatrice binary
|
||||||
|
|
||||||
project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
||||||
|
|
||||||
|
# ------------------------
|
||||||
|
# Paths and directories
|
||||||
|
# ------------------------
|
||||||
set(cockatrice_SOURCES
|
set(cockatrice_SOURCES
|
||||||
${VERSION_STRING_CPP}
|
${VERSION_STRING_CPP}
|
||||||
# sort by alphabetical order, so that there is no debate about where to add new sources to the list
|
# sort by alphabetical order, so that there is no debate about where to add new sources to the list
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
# CMakeLists for themes directory
|
# CMakeLists for ./cockatrice/themes directory
|
||||||
#
|
#
|
||||||
# add themes subfolders
|
# Add themes subfolders
|
||||||
|
|
||||||
set(defthemes Default Fabric Fusion Leather Plasma VelvetMarble)
|
set(defthemes Default Fabric Fusion Leather Plasma VelvetMarble)
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
if(APPLE)
|
if(APPLE) # macOS
|
||||||
install(DIRECTORY ${defthemes} DESTINATION Cockatrice.app/Contents/Resources/themes/)
|
install(DIRECTORY ${defthemes} DESTINATION Cockatrice.app/Contents/Resources/themes/)
|
||||||
else()
|
else() # Assume Linux
|
||||||
# Assume linux
|
|
||||||
install(DIRECTORY ${defthemes} DESTINATION share/cockatrice/themes/)
|
install(DIRECTORY ${defthemes} DESTINATION share/cockatrice/themes/)
|
||||||
endif()
|
endif()
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_card" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_deck_list" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_filters" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_interfaces" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_models" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_network" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_protocol" directory
|
||||||
|
#
|
||||||
# Top-level wrapper for the protobuf library
|
# Top-level wrapper for the protobuf library
|
||||||
|
|
||||||
add_subdirectory(libcockatrice/protocol/pb)
|
add_subdirectory(libcockatrice/protocol/pb)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_rng" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "libcockatrice_settings" directory
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.16)
|
# CMakeLists for "libcockatrice_utility" directory
|
||||||
|
|
||||||
project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,7 @@
|
||||||
cmake_minimum_required(VERSION 3.16)
|
# CMakeLists for "oracle" directory
|
||||||
|
#
|
||||||
|
# Provides the Oracle binary
|
||||||
|
|
||||||
project(Oracle VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
project(Oracle VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
||||||
|
|
||||||
# ------------------------
|
# ------------------------
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
# CMakeLists for servatrice directory
|
# CMakeLists for "servatrice" directory
|
||||||
#
|
#
|
||||||
# provides the servatrice binary
|
# Provides the Servatrice binary
|
||||||
|
|
||||||
project(Servatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
project(Servatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
||||||
|
|
||||||
|
# ------------------------
|
||||||
|
# Paths and directories
|
||||||
|
# ------------------------
|
||||||
set(servatrice_SOURCES
|
set(servatrice_SOURCES
|
||||||
src/email_parser.cpp
|
src/email_parser.cpp
|
||||||
src/event_loop_watchdog.cpp
|
src/event_loop_watchdog.cpp
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "tests" directory
|
||||||
|
|
||||||
# NOTE: Qt modules for tests are defined centrally in cmake/FindQtRuntime.cmake (the _TEST_NEEDED variable).
|
# NOTE: Qt modules for tests are defined centrally in cmake/FindQtRuntime.cmake (the _TEST_NEEDED variable).
|
||||||
# If a new test needs additional Qt modules, add them there — not in individual test CMakeLists.txt files.
|
# If a new test needs additional Qt modules, add them there — not in individual test CMakeLists.txt files.
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
@ -20,8 +22,6 @@ add_test(NAME metrics_registry_test COMMAND metrics_registry_test)
|
||||||
add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
|
add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
|
||||||
set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 15)
|
set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 15)
|
||||||
|
|
||||||
# Find GTest
|
|
||||||
|
|
||||||
add_executable(dummy_test dummy_test.cpp)
|
add_executable(dummy_test dummy_test.cpp)
|
||||||
add_executable(expression_test expression_test.cpp)
|
add_executable(expression_test expression_test.cpp)
|
||||||
add_executable(clamped_arithmetic_test clamped_arithmetic_test.cpp)
|
add_executable(clamped_arithmetic_test clamped_arithmetic_test.cpp)
|
||||||
|
|
@ -39,6 +39,7 @@ target_include_directories(lag_monitor_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatri
|
||||||
add_executable(latency_tracker_test latency_tracker_test.cpp)
|
add_executable(latency_tracker_test latency_tracker_test.cpp)
|
||||||
add_executable(metrics_registry_test ../servatrice/src/metrics_registry.cpp metrics_registry_test.cpp)
|
add_executable(metrics_registry_test ../servatrice/src/metrics_registry.cpp metrics_registry_test.cpp)
|
||||||
|
|
||||||
|
# Find GTest
|
||||||
find_package(GTest)
|
find_package(GTest)
|
||||||
|
|
||||||
if(NOT GTEST_FOUND)
|
if(NOT GTEST_FOUND)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "card_zone_algorithms" directory
|
||||||
|
|
||||||
add_executable(card_zone_algorithms_test card_zone_algorithms_test.cpp)
|
add_executable(card_zone_algorithms_test card_zone_algorithms_test.cpp)
|
||||||
|
|
||||||
target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones)
|
target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.16)
|
# CMakeLists for "carddatabase" directory
|
||||||
|
|
||||||
project(CardDatabaseTests VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
project(CardDatabaseTests VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
||||||
|
|
||||||
# ------------------------
|
# ------------------------
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "deck_list_model" directory
|
||||||
|
|
||||||
add_executable(deck_list_model_custom_zones_test ${VERSION_STRING_CPP} deck_list_model_custom_zones_test.cpp)
|
add_executable(deck_list_model_custom_zones_test ${VERSION_STRING_CPP} deck_list_model_custom_zones_test.cpp)
|
||||||
|
|
||||||
if(NOT GTEST_FOUND)
|
if(NOT GTEST_FOUND)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "deck_list_zones" directory
|
||||||
|
|
||||||
add_executable(deck_list_zones_test deck_list_zones_test.cpp)
|
add_executable(deck_list_zones_test deck_list_zones_test.cpp)
|
||||||
|
|
||||||
if(NOT GTEST_FOUND)
|
if(NOT GTEST_FOUND)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "loading_from_clipboard" directory
|
||||||
|
|
||||||
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
|
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
|
||||||
add_executable(loading_from_clipboard_test ${VERSION_STRING_CPP} clipboard_testing.cpp loading_from_clipboard_test.cpp)
|
add_executable(loading_from_clipboard_test ${VERSION_STRING_CPP} clipboard_testing.cpp loading_from_clipboard_test.cpp)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "movecard_tests" directory
|
||||||
|
|
||||||
add_executable(reverse_card_move_test reverse_card_move_test.cpp)
|
add_executable(reverse_card_move_test reverse_card_move_test.cpp)
|
||||||
|
|
||||||
if(NOT GTEST_FOUND)
|
if(NOT GTEST_FOUND)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "oracle" directory
|
||||||
|
|
||||||
add_executable(parse_cipt_test ../../oracle/src/parsehelpers.cpp parse_cipt_test.cpp)
|
add_executable(parse_cipt_test ../../oracle/src/parsehelpers.cpp parse_cipt_test.cpp)
|
||||||
|
|
||||||
if(NOT GTEST_FOUND)
|
if(NOT GTEST_FOUND)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
# CMakeLists for "settings" directory
|
||||||
|
|
||||||
add_executable(settings_manager_test settings_manager_test.cpp)
|
add_executable(settings_manager_test settings_manager_test.cpp)
|
||||||
add_executable(settings_defaults_test settings_defaults_test.cpp)
|
add_executable(settings_defaults_test settings_defaults_test.cpp)
|
||||||
add_executable(settings_migration_test settings_migration_test.cpp)
|
add_executable(settings_migration_test settings_migration_test.cpp)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue