Merge branch 'master' into master

This commit is contained in:
Jurriaan 2026-11-02 16:43:51 +01:00 • committed by GitHub
commit ba22736def
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
114 changed files with 4835 additions and 1044 deletions

View file

@ -21,10 +21,12 @@ cockatrice_add_test(
)
# ------------------------
# Filter String and Tree Test
# (guard must match the condition for libcockatrice_filters in the root CMakeLists.txt)
# Guard to match condition for libcockatrice_filters in the root CMakeLists.txt
# ------------------------
if(WITH_ORACLE OR WITH_CLIENT)
# ------------------------
# Filter String Test
# ------------------------
cockatrice_add_test(
NAME
filter_string_test
@ -35,6 +37,10 @@ if(WITH_ORACLE OR WITH_CLIENT)
LIBS
libcockatrice_filters
)
# ------------------------
# Filter Tree Test
# ------------------------
cockatrice_add_test(
NAME
filter_tree_test
@ -45,6 +51,21 @@ if(WITH_ORACLE OR WITH_CLIENT)
LIBS
libcockatrice_filters
)
# ------------------------
# Visual Display Model Test
# ------------------------
cockatrice_add_test(
NAME
visual_display_model_test
SOURCES
${VERSION_STRING_CPP}
visual_display_model_test.cpp
mocks.cpp
LIBS
libcockatrice_card
libcockatrice_models
)
endif()
# ------------------------