jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 06:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finally, CMake linting.

Browse source 
Took 11 minutes

Took 4 minutes
This commit is contained in:
Lukas Brübach 2025-10-05 00:29:52 +02:00
parent ecfcc078c4
commit 33cd0098f8
16 changed files with 302 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cockatrice/CMakeLists.txt
View file

@ -362,9 +362,27 @@ elseif(Qt5_FOUND)
endif() endif()
if(Qt5_FOUND) if(Qt5_FOUND)
target_link_libraries(cockatrice cockatrice_card cockatrice_deck_list utility cockatrice_server cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES}) target_link_libraries(
cockatrice
cockatrice_card
cockatrice_deck_list
utility
cockatrice_server
cockatrice_rng
cockatrice_common
${COCKATRICE_QT_MODULES}
)
else() else()
target_link_libraries(cockatrice PUBLIC cockatrice_card cockatrice_deck_list utility cockatrice_server cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES}) target_link_libraries(
cockatrice
PUBLIC cockatrice_card
cockatrice_deck_list
utility
cockatrice_server
cockatrice_rng
cockatrice_common
${COCKATRICE_QT_MODULES}
)
endif() endif()
if(UNIX) if(UNIX)

3
common/CMakeLists.txt
View file

@ -2,8 +2,7 @@
# #
# provides the common library # provides the common library
set(common_SOURCES set(common_SOURCES)
)
set(ORACLE_LIBS) set(ORACLE_LIBS)

76
dbconverter/CMakeLists.txt
View file

@ -4,11 +4,7 @@ project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.$
# ------------------------ # ------------------------
# Sources # Sources
# ------------------------ # ------------------------
set(dbconverter_SOURCES set(dbconverter_SOURCES src/main.cpp src/mocks.cpp ${VERSION_STRING_CPP})
src/main.cpp
src/mocks.cpp
${VERSION_STRING_CPP}
)
# ------------------------ # ------------------------
# Qt configuration # Qt configuration
@ -26,18 +22,20 @@ add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
# ------------------------ # ------------------------
# Include directories # Include directories
# ------------------------ # ------------------------
target_include_directories(dbconverter target_include_directories(
PRIVATE ../common # shared common headers dbconverter
PRIVATE ../libs/card/include # cockatrice_card public headers PRIVATE ../common # shared common headers
PRIVATE ../libs/card/include # cockatrice_card public headers
) )
# ------------------------ # ------------------------
# Link libraries # Link libraries
# ------------------------ # ------------------------
target_link_libraries(dbconverter target_link_libraries(
PRIVATE cockatrice_card dbconverter
PRIVATE cockatrice_settings PRIVATE cockatrice_card
PRIVATE ${DB_CONVERTER_QT_MODULES} PRIVATE cockatrice_settings
PRIVATE ${DB_CONVERTER_QT_MODULES}
) )
# ------------------------ # ------------------------
@ -69,33 +67,33 @@ if(APPLE)
set(qtconf_dest_dir dbconverter.app/Contents/Resources) set(qtconf_dest_dir dbconverter.app/Contents/Resources)
install( install(
DIRECTORY "${QT_PLUGINS_DIR}/" DIRECTORY "${QT_PLUGINS_DIR}/"
DESTINATION ${plugin_dest_dir} DESTINATION ${plugin_dest_dir}
COMPONENT Runtime COMPONENT Runtime
FILES_MATCHING FILES_MATCHING
PATTERN "*.dSYM" EXCLUDE PATTERN "*.dSYM" EXCLUDE
PATTERN "*_debug.dylib" EXCLUDE PATTERN "*_debug.dylib" EXCLUDE
PATTERN "platforms/*.dylib" PATTERN "platforms/*.dylib"
) )
install( install(
CODE " CODE "
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
Plugins = Plugins Plugins = Plugins
Translations = Resources/translations\") Translations = Resources/translations\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
install( install(
CODE " CODE "
file(GLOB_RECURSE QTPLUGINS file(GLOB_RECURSE QTPLUGINS
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
endif() endif()
@ -104,40 +102,40 @@ if(WIN32)
set(qtconf_dest_dir .) set(qtconf_dest_dir .)
install( install(
DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
DESTINATION ./ DESTINATION ./
FILES_MATCHING FILES_MATCHING
PATTERN "*.dll" PATTERN "*.dll"
) )
install( install(
DIRECTORY "${QT_PLUGINS_DIR}/" DIRECTORY "${QT_PLUGINS_DIR}/"
DESTINATION ${plugin_dest_dir} DESTINATION ${plugin_dest_dir}
COMPONENT Runtime COMPONENT Runtime
FILES_MATCHING FILES_MATCHING
PATTERN "platforms/qdirect2d.dll" PATTERN "platforms/qdirect2d.dll"
PATTERN "platforms/qminimal.dll" PATTERN "platforms/qminimal.dll"
PATTERN "platforms/qoffscreen.dll" PATTERN "platforms/qoffscreen.dll"
PATTERN "platforms/qwindows.dll" PATTERN "platforms/qwindows.dll"
) )
install( install(
CODE " CODE "
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
Plugins = Plugins Plugins = Plugins
Translations = Resources/translations\") Translations = Resources/translations\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
install( install(
CODE " CODE "
file(GLOB_RECURSE QTPLUGINS file(GLOB_RECURSE QTPLUGINS
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
endif() endif()

71
libs/card/CMakeLists.txt
View file

@ -24,43 +24,46 @@ set(HEADERS
include/card/card_relation/card_relation.h include/card/card_relation/card_relation.h
) )
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library(cockatrice_card STATIC add_library(
src/card_info.cpp cockatrice_card STATIC
src/card_info_comparator.cpp ${MOC_SOURCES}
src/card_database/card_database.cpp src/card_database/card_database.cpp
src/card_database/card_database_loader.cpp src/card_database/card_database_loader.cpp
src/card_database/card_database_manager.cpp src/card_database/card_database_manager.cpp
src/card_database/card_database_querier.cpp src/card_database/card_database_querier.cpp
src/card_database/model/card_database_model.cpp src/card_database/model/card/card_completer_proxy_model.cpp
src/card_database/model/card_database_display_model.cpp src/card_database/model/card/card_search_model.cpp
src/card_database/model/card/card_completer_proxy_model.cpp src/card_database/model/card_database_display_model.cpp
src/card_database/model/card/card_search_model.cpp src/card_database/model/card_database_model.cpp
src/card_database/model/token/token_display_model.cpp src/card_database/model/token/token_display_model.cpp
src/card_database/model/token/token_edit_model.cpp src/card_database/model/token/token_edit_model.cpp
src/card_database/parser/card_database_parser.cpp src/card_database/parser/card_database_parser.cpp
src/card_database/parser/cockatrice_xml_3.cpp src/card_database/parser/cockatrice_xml_3.cpp
src/card_database/parser/cockatrice_xml_4.cpp src/card_database/parser/cockatrice_xml_4.cpp
src/card_printing/exact_card.cpp src/card_info.cpp
src/card_printing/printing_info.cpp src/card_info_comparator.cpp
src/card_set/card_set.cpp src/card_printing/exact_card.cpp
src/card_set/card_set_list.cpp src/card_printing/printing_info.cpp
src/card_relation/card_relation.cpp src/card_relation/card_relation.cpp
${MOC_SOURCES} src/card_set/card_set.cpp
src/card_set/card_set_list.cpp
) )
target_include_directories(cockatrice_card target_include_directories(
PUBLIC include cockatrice_card
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
) )
target_link_libraries(cockatrice_card target_link_libraries(
PUBLIC cockatrice_settings cockatrice_card
PUBLIC ${COCKATRICE_QT_MODULES} PUBLIC cockatrice_settings
PUBLIC ${COCKATRICE_QT_MODULES}
) )

35
libs/deck_list/CMakeLists.txt
View file

@ -3,34 +3,23 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS
include/deck_list/abstract_deck_list_card_node.h include/deck_list/abstract_deck_list_card_node.h include/deck_list/abstract_deck_list_node.h
include/deck_list/abstract_deck_list_node.h include/deck_list/deck_list.h include/deck_list/deck_list_card_node.h include/deck_list/inner_deck_list_node.h
include/deck_list/deck_list.h
include/deck_list/deck_list_card_node.h
include/deck_list/inner_deck_list_node.h
) )
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library(cockatrice_deck_list STATIC add_library(
src/abstract_deck_list_card_node.cpp cockatrice_deck_list STATIC ${MOC_SOURCES} src/abstract_deck_list_card_node.cpp src/abstract_deck_list_node.cpp
src/abstract_deck_list_node.cpp src/deck_list.cpp src/deck_list_card_node.cpp src/inner_deck_list_node.cpp
src/deck_list.cpp
src/deck_list_card_node.cpp
src/inner_deck_list_node.cpp
${MOC_SOURCES}
) )
add_dependencies(cockatrice_deck_list cockatrice_protocol_wrapper) add_dependencies(cockatrice_deck_list cockatrice_protocol_wrapper)
target_include_directories(cockatrice_deck_list target_include_directories(cockatrice_deck_list PUBLIC include)
PUBLIC include
)
target_link_libraries(cockatrice_deck_list target_link_libraries(cockatrice_deck_list PUBLIC cockatrice_protocol_wrapper utility ${COCKATRICE_QT_MODULES})
PUBLIC cockatrice_protocol_wrapper utility ${COCKATRICE_QT_MODULES}
)

13
libs/protocol/CMakeLists.txt
View file

@ -2,16 +2,15 @@
add_subdirectory(pb) add_subdirectory(pb)
add_library(cockatrice_protocol_wrapper STATIC add_library(
# Optionally, you can add a dummy source if needed cockatrice_protocol_wrapper STATIC
# Optionally, you can add a dummy source if needed
) )
# Link the actual generated protobuf library # Link the actual generated protobuf library
target_link_libraries(cockatrice_protocol_wrapper target_link_libraries(cockatrice_protocol_wrapper PUBLIC cockatrice_protocol)
PUBLIC cockatrice_protocol
)
# Expose the pb/ folder so consumers can do #include "pb/header.pb.h" # Expose the pb/ folder so consumers can do #include "pb/header.pb.h"
target_include_directories(cockatrice_protocol_wrapper target_include_directories(
PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers cockatrice_protocol_wrapper PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
) )

6
libs/protocol/pb/CMakeLists.txt
View file

@ -183,8 +183,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
# remove unused parameter and misleading indentation warnings when compiling to avoid errors # remove unused parameter and misleading indentation warnings when compiling to avoid errors
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-unused-parameter -Wno-misleading-indentation") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-unused-parameter -Wno-misleading-indentation")
message(WARNING "Older protobuf version found (${Protobuf_VERSION} < 3.1.0), " message(WARNING "Older protobuf version found (${Protobuf_VERSION} < 3.1.0), "
"disabled the warnings 'unused-parameter' and 'misleading-indentation' for protobuf generated code " "disabled the warnings 'unused-parameter' and 'misleading-indentation' for protobuf generated code "
"to avoid compilation errors." "to avoid compilation errors."
) )
endif() endif()
else() else()
@ -194,6 +194,6 @@ else()
target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}") target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}")
protobuf_generate( protobuf_generate(
TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}" TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}"
) )
endif() endif()

39
libs/rng/CMakeLists.txt
View file

@ -2,29 +2,20 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS include/rng/rng_abstract.h include/rng/rng_sfmt.h include/rng/sfmt/SFMT.h)
include/rng/rng_abstract.h
include/rng/rng_sfmt.h if(Qt6_FOUND)
include/rng/sfmt/SFMT.h qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(cockatrice_rng STATIC ${MOC_SOURCES} src/rng_abstract.cpp src/rng_sfmt.cpp src/sfmt/SFMT.c)
target_include_directories(
cockatrice_rng
PUBLIC include
PUBLIC include/sfmt
) )
if (Qt6_FOUND) target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES})
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif ()
add_library(cockatrice_rng STATIC
src/rng_abstract.cpp
src/rng_sfmt.cpp
src/sfmt/SFMT.c
${MOC_SOURCES}
)
target_include_directories(cockatrice_rng
PUBLIC include
PUBLIC include/sfmt
)
target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}
)

67
libs/server/CMakeLists.txt
View file

@ -24,43 +24,46 @@ set(HEADERS
include/server/serverinfo_user_container.h include/server/serverinfo_user_container.h
) )
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library(cockatrice_server STATIC add_library(
src/game/server_abstract_participant.cpp cockatrice_server STATIC
src/game/server_arrow.cpp ${MOC_SOURCES}
src/game/server_arrowtarget.cpp src/debug_pb_message.cpp
src/game/server_card.cpp src/game/server_abstract_participant.cpp
src/game/server_cardzone.cpp src/game/server_arrow.cpp
src/game/server_counter.cpp src/game/server_arrowtarget.cpp
src/game/server_game.cpp src/game/server_card.cpp
src/game/server_player.cpp src/game/server_cardzone.cpp
src/game/server_spectator.cpp src/game/server_counter.cpp
src/debug_pb_message.cpp src/game/server_game.cpp
src/get_pb_extension.cpp src/game/server_player.cpp
src/server.cpp src/game/server_spectator.cpp
src/server_abstractuserinterface.cpp src/get_pb_extension.cpp
src/server_database_interface.cpp src/server.cpp
src/server_protocolhandler.cpp src/server_abstractuserinterface.cpp
src/server_remoteuserinterface.cpp src/server_database_interface.cpp
src/server_response_containers.cpp src/server_protocolhandler.cpp
src/server_room.cpp src/server_remoteuserinterface.cpp
src/serverinfo_user_container.cpp src/server_response_containers.cpp
${MOC_SOURCES} src/server_room.cpp
src/serverinfo_user_container.cpp
) )
add_dependencies(cockatrice_server cockatrice_protocol_wrapper) add_dependencies(cockatrice_server cockatrice_protocol_wrapper)
target_include_directories(cockatrice_server target_include_directories(
PUBLIC include cockatrice_server
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common
) )
# Make cockatrice_server depend on cockatrice_protocol # Make cockatrice_server depend on cockatrice_protocol
target_link_libraries(cockatrice_server target_link_libraries(
PUBLIC cockatrice_common cockatrice_protocol_wrapper utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES} cockatrice_server PUBLIC cockatrice_common cockatrice_protocol_wrapper utility cockatrice_rng cockatrice_deck_list
) ${COCKATRICE_QT_MODULES}
)

56
libs/settings/CMakeLists.txt
View file

@ -19,36 +19,36 @@ set(HEADERS
include/settings/shortcuts_settings.h include/settings/shortcuts_settings.h
) )
if (Qt6_FOUND) if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND) elseif(Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif()
add_library(cockatrice_settings STATIC add_library(
src/cache_settings.cpp cockatrice_settings STATIC
src/card_counter_settings.cpp ${MOC_SOURCES}
src/card_database_settings.cpp src/cache_settings.cpp
src/card_override_settings.cpp src/card_counter_settings.cpp
src/debug_settings.cpp src/card_database_settings.cpp
src/download_settings.cpp src/card_override_settings.cpp
src/game_filters_settings.cpp src/debug_settings.cpp
src/layouts_settings.cpp src/download_settings.cpp
src/message_settings.cpp src/game_filters_settings.cpp
src/recents_settings.cpp src/layouts_settings.cpp
src/servers_settings.cpp src/message_settings.cpp
src/settings_manager.cpp src/recents_settings.cpp
src/shortcut_treeview.cpp src/servers_settings.cpp
src/shortcuts_settings.cpp src/settings_manager.cpp
${MOC_SOURCES} src/shortcut_treeview.cpp
src/shortcuts_settings.cpp
) )
target_include_directories(cockatrice_settings target_include_directories(
PUBLIC include cockatrice_settings
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
) )
target_link_libraries(cockatrice_settings target_link_libraries(cockatrice_settings PUBLIC cockatrice_common utility ${COCKATRICE_QT_MODULES})
PUBLIC cockatrice_common utility ${COCKATRICE_QT_MODULES}
)

22
libs/utility/CMakeLists.txt
View file

@ -5,13 +5,8 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(UTILITY_SOURCES set(UTILITY_SOURCES src/expression.cpp src/featureset.cpp src/key_signals.cpp src/levenshtein.cpp src/logger.cpp
src/expression.cpp src/passwordhasher.cpp
src/featureset.cpp
src/key_signals.cpp
src/levenshtein.cpp
src/logger.cpp
src/passwordhasher.cpp
) )
set(UTILITY_HEADERS set(UTILITY_HEADERS
@ -26,18 +21,11 @@ set(UTILITY_HEADERS
include/utility/trice_limits.h include/utility/trice_limits.h
) )
add_library(utility STATIC add_library(utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS})
${UTILITY_SOURCES}
${UTILITY_HEADERS}
)
target_include_directories(utility target_include_directories(utility PUBLIC include)
PUBLIC include
)
target_link_libraries(utility target_link_libraries(utility PUBLIC ${COCKATRICE_QT_MODULES})
PUBLIC ${COCKATRICE_QT_MODULES}
)
set(ORACLE_LIBS) set(ORACLE_LIBS)

119
oracle/CMakeLists.txt
View file

@ -44,12 +44,7 @@ endif()
# ------------------------ # ------------------------
# Include directories # Include directories
# ------------------------ # ------------------------
include_directories( include_directories(../libs/card/include ../libs/settings/include ../cockatrice/src ../common)
../libs/card/include
../libs/settings/include
../cockatrice/src
../common
)
# ------------------------ # ------------------------
# Optional libraries # Optional libraries
@ -79,13 +74,13 @@ endif()
# ------------------------ # ------------------------
if(Qt6_FOUND) if(Qt6_FOUND)
qt6_add_executable( qt6_add_executable(
oracle oracle
WIN32 WIN32
MACOSX_BUNDLE MACOSX_BUNDLE
${oracle_SOURCES} ${oracle_SOURCES}
${oracle_RESOURCES_RCC} ${oracle_RESOURCES_RCC}
${oracle_MOC_SRCS} ${oracle_MOC_SRCS}
MANUAL_FINALIZATION MANUAL_FINALIZATION
) )
elseif(Qt5_FOUND) elseif(Qt5_FOUND)
if(Qt5LinguistTools_FOUND) if(Qt5LinguistTools_FOUND)
@ -103,10 +98,11 @@ endif()
# ------------------------ # ------------------------
# Link libraries # Link libraries
# ------------------------ # ------------------------
target_link_libraries(oracle target_link_libraries(
PRIVATE cockatrice_card oracle
PRIVATE cockatrice_settings PRIVATE cockatrice_card
PRIVATE ${ORACLE_QT_MODULES} PRIVATE cockatrice_settings
PRIVATE ${ORACLE_QT_MODULES}
) )
if(ZLIB_FOUND) if(ZLIB_FOUND)
@ -135,7 +131,7 @@ endif()
if(NOT WIN32 AND NOT APPLE) if(NOT WIN32 AND NOT APPLE)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR})
endif () endif()
# ------------------------ # ------------------------
# Qt plugin handling # Qt plugin handling
@ -145,36 +141,36 @@ if(APPLE)
set(qtconf_dest_dir oracle.app/Contents/Resources) set(qtconf_dest_dir oracle.app/Contents/Resources)
install( install(
DIRECTORY "${QT_PLUGINS_DIR}/" DIRECTORY "${QT_PLUGINS_DIR}/"
DESTINATION ${plugin_dest_dir} DESTINATION ${plugin_dest_dir}
COMPONENT Runtime COMPONENT Runtime
FILES_MATCHING FILES_MATCHING
PATTERN "*.dSYM" EXCLUDE PATTERN "*.dSYM" EXCLUDE
PATTERN "*_debug.dylib" EXCLUDE PATTERN "*_debug.dylib" EXCLUDE
PATTERN "iconengines/*.dylib" PATTERN "iconengines/*.dylib"
PATTERN "platforms/*.dylib" PATTERN "platforms/*.dylib"
PATTERN "styles/*.dylib" PATTERN "styles/*.dylib"
PATTERN "tls/*.dylib" PATTERN "tls/*.dylib"
) )
install( install(
CODE " CODE "
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
Plugins = Plugins Plugins = Plugins
Translations = Resources/translations\") Translations = Resources/translations\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
install( install(
CODE " CODE "
file(GLOB_RECURSE QTPLUGINS file(GLOB_RECURSE QTPLUGINS
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
endif() endif()
@ -184,49 +180,49 @@ if(WIN32)
list(APPEND libSearchDirs ${QT_LIBRARY_DIR}) list(APPEND libSearchDirs ${QT_LIBRARY_DIR})
install( install(
DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
DESTINATION ./ DESTINATION ./
FILES_MATCHING FILES_MATCHING
PATTERN "*.dll" PATTERN "*.dll"
) )
install( install(
DIRECTORY "${QT_PLUGINS_DIR}/" DIRECTORY "${QT_PLUGINS_DIR}/"
DESTINATION ${plugin_dest_dir} DESTINATION ${plugin_dest_dir}
COMPONENT Runtime COMPONENT Runtime
FILES_MATCHING FILES_MATCHING
PATTERN "iconengines/qsvgicon.dll" PATTERN "iconengines/qsvgicon.dll"
PATTERN "platforms/qdirect2d.dll" PATTERN "platforms/qdirect2d.dll"
PATTERN "platforms/qminimal.dll" PATTERN "platforms/qminimal.dll"
PATTERN "platforms/qoffscreen.dll" PATTERN "platforms/qoffscreen.dll"
PATTERN "platforms/qwindows.dll" PATTERN "platforms/qwindows.dll"
PATTERN "styles/qcertonlybackend.dll" PATTERN "styles/qcertonlybackend.dll"
PATTERN "styles/qopensslbackend.dll" PATTERN "styles/qopensslbackend.dll"
PATTERN "styles/qschannelbackend.dll" PATTERN "styles/qschannelbackend.dll"
PATTERN "styles/qwindowsvistastyle.dll" PATTERN "styles/qwindowsvistastyle.dll"
PATTERN "tls/qcertonlybackend.dll" PATTERN "tls/qcertonlybackend.dll"
PATTERN "tls/qopensslbackend.dll" PATTERN "tls/qopensslbackend.dll"
PATTERN "tls/qschannelbackend.dll" PATTERN "tls/qschannelbackend.dll"
) )
install( install(
CODE " CODE "
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
Plugins = Plugins Plugins = Plugins
Translations = Resources/translations\") Translations = Resources/translations\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
install( install(
CODE " CODE "
file(GLOB_RECURSE QTPLUGINS file(GLOB_RECURSE QTPLUGINS
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\")
" "
COMPONENT Runtime COMPONENT Runtime
) )
endif() endif()
@ -237,10 +233,13 @@ if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
if(UPDATE_TRANSLATIONS) if(UPDATE_TRANSLATIONS)
file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp) file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp)
qt6_add_translations( qt6_add_translations(
oracle oracle
TS_FILES ${oracle_TS} TS_FILES
SOURCES ${translate_oracle_SRCS} ${oracle_TS}
QM_FILES_OUTPUT_VARIABLE oracle_QM SOURCES
${translate_oracle_SRCS}
QM_FILES_OUTPUT_VARIABLE
oracle_QM
) )
else() else()
qt6_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM) qt6_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM)

14
servatrice/CMakeLists.txt
View file

@ -106,9 +106,19 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES}) add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES})
if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
target_link_libraries(servatrice cockatrice_common cockatrice_deck_list cockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES} ${LIBEXECINFO_LIBRARY}) target_link_libraries(
servatrice
cockatrice_common
cockatrice_deck_list
cockatrice_server
Threads::Threads
${SERVATRICE_QT_MODULES}
${LIBEXECINFO_LIBRARY}
)
else() else()
target_link_libraries(servatrice cockatrice_common cockatrice_deck_list cockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES}) target_link_libraries(
servatrice cockatrice_common cockatrice_deck_list cockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES}
)
endif() endif()
# install rules # install rules

61
tests/carddatabase/CMakeLists.txt
View file

@ -9,30 +9,23 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
# ------------------------ # ------------------------
# Qt modules # Qt modules
# ------------------------ # ------------------------
set(TEST_QT_MODULES set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg
${COCKATRICE_QT_VERSION_NAME}::Network
${COCKATRICE_QT_VERSION_NAME}::Widgets
${COCKATRICE_QT_VERSION_NAME}::Svg
) )
# ------------------------ # ------------------------
# Card Database Test # Card Database Test
# ------------------------ # ------------------------
add_executable(carddatabase_test add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddatabase_test.cpp mocks.cpp)
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
carddatabase_test.cpp
mocks.cpp
)
target_link_libraries(carddatabase_test target_link_libraries(
PRIVATE cockatrice_card carddatabase_test
PRIVATE cockatrice_settings PRIVATE cockatrice_card
PRIVATE cockatrice_common PRIVATE cockatrice_settings
PRIVATE Threads::Threads PRIVATE cockatrice_common
PRIVATE ${GTEST_BOTH_LIBRARIES} PRIVATE Threads::Threads
PRIVATE ${TEST_QT_MODULES} PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
) )
add_test(NAME carddatabase_test COMMAND carddatabase_test) add_test(NAME carddatabase_test COMMAND carddatabase_test)
@ -40,23 +33,25 @@ add_test(NAME carddatabase_test COMMAND carddatabase_test)
# ------------------------ # ------------------------
# Filter String Test # Filter String Test
# ------------------------ # ------------------------
add_executable(filter_string_test add_executable(
${MOCKS_SOURCES} filter_string_test
${VERSION_STRING_CPP} ${MOCKS_SOURCES}
../../cockatrice/src/filters/filter_card.cpp ${VERSION_STRING_CPP}
../../cockatrice/src/filters/filter_string.cpp ../../cockatrice/src/filters/filter_card.cpp
../../cockatrice/src/filters/filter_tree.cpp ../../cockatrice/src/filters/filter_string.cpp
filter_string_test.cpp ../../cockatrice/src/filters/filter_tree.cpp
mocks.cpp filter_string_test.cpp
mocks.cpp
) )
target_link_libraries(filter_string_test target_link_libraries(
PRIVATE cockatrice_card filter_string_test
PRIVATE cockatrice_settings PRIVATE cockatrice_card
PRIVATE cockatrice_common PRIVATE cockatrice_settings
PRIVATE Threads::Threads PRIVATE cockatrice_common
PRIVATE ${GTEST_BOTH_LIBRARIES} PRIVATE Threads::Threads
PRIVATE ${TEST_QT_MODULES} PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
) )
add_test(NAME filter_string_test COMMAND filter_string_test) add_test(NAME filter_string_test COMMAND filter_string_test)

7
tests/loading_from_clipboard/CMakeLists.txt
View file

@ -1,7 +1,5 @@
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
add_executable( add_executable(loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp)
loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp
)
if(NOT GTEST_FOUND) if(NOT GTEST_FOUND)
add_dependencies(loading_from_clipboard_test gtest) add_dependencies(loading_from_clipboard_test gtest)
@ -12,6 +10,7 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE
) )
target_link_libraries( target_link_libraries(
loading_from_clipboard_test cockatrice_common cockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} loading_from_clipboard_test cockatrice_common cockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES}
${TEST_QT_MODULES}
) )
add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test) add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test)

2
vcpkg

@ -1 +1 @@
Subproject commit 29ff5b8131d0c6c8fcb8fbaef35992f0d507cd7c Subproject commit bb1ca2757bca8f8e372a4deb35943828e3b0d155