mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-14 06:22:15 -07:00
Finally, CMake linting.
Took 11 minutes Took 4 minutes
This commit is contained in:
Lukas Brübach
parent
ecfcc078c4
commit
33cd0098f8
16 changed files with 302 additions and 311 deletions
|
|
@ -362,9 +362,27 @@ elseif(Qt5_FOUND)
|
|||
endif()
|
||||
|
||||
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()
|
||||
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()
|
||||
|
||||
if(UNIX)
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
#
|
||||
# provides the common library
|
||||
|
||||
set(common_SOURCES
|
||||
)
|
||||
set(common_SOURCES)
|
||||
|
||||
set(ORACLE_LIBS)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,7 @@ project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.$
|
|||
# ------------------------
|
||||
# Sources
|
||||
# ------------------------
|
||||
set(dbconverter_SOURCES
|
||||
src/main.cpp
|
||||
src/mocks.cpp
|
||||
${VERSION_STRING_CPP}
|
||||
)
|
||||
set(dbconverter_SOURCES src/main.cpp src/mocks.cpp ${VERSION_STRING_CPP})
|
||||
|
||||
# ------------------------
|
||||
# Qt configuration
|
||||
|
|
@ -26,18 +22,20 @@ add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
|
|||
# ------------------------
|
||||
# Include directories
|
||||
# ------------------------
|
||||
target_include_directories(dbconverter
|
||||
PRIVATE ../common # shared common headers
|
||||
PRIVATE ../libs/card/include # cockatrice_card public headers
|
||||
target_include_directories(
|
||||
dbconverter
|
||||
PRIVATE ../common # shared common headers
|
||||
PRIVATE ../libs/card/include # cockatrice_card public headers
|
||||
)
|
||||
|
||||
# ------------------------
|
||||
# Link libraries
|
||||
# ------------------------
|
||||
target_link_libraries(dbconverter
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE ${DB_CONVERTER_QT_MODULES}
|
||||
target_link_libraries(
|
||||
dbconverter
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE ${DB_CONVERTER_QT_MODULES}
|
||||
)
|
||||
|
||||
# ------------------------
|
||||
|
|
@ -69,33 +67,33 @@ if(APPLE)
|
|||
set(qtconf_dest_dir dbconverter.app/Contents/Resources)
|
||||
|
||||
install(
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dSYM" EXCLUDE
|
||||
PATTERN "*_debug.dylib" EXCLUDE
|
||||
PATTERN "platforms/*.dylib"
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dSYM" EXCLUDE
|
||||
PATTERN "*_debug.dylib" EXCLUDE
|
||||
PATTERN "platforms/*.dylib"
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
|
||||
Plugins = Plugins
|
||||
Translations = Resources/translations\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(GLOB_RECURSE QTPLUGINS
|
||||
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
|
||||
set(BU_CHMOD_BUNDLE_ITEMS ON)
|
||||
include(BundleUtilities)
|
||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -104,40 +102,40 @@ if(WIN32)
|
|||
set(qtconf_dest_dir .)
|
||||
|
||||
install(
|
||||
DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
|
||||
DESTINATION ./
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dll"
|
||||
DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
|
||||
DESTINATION ./
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dll"
|
||||
)
|
||||
|
||||
install(
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "platforms/qdirect2d.dll"
|
||||
PATTERN "platforms/qminimal.dll"
|
||||
PATTERN "platforms/qoffscreen.dll"
|
||||
PATTERN "platforms/qwindows.dll"
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "platforms/qdirect2d.dll"
|
||||
PATTERN "platforms/qminimal.dll"
|
||||
PATTERN "platforms/qoffscreen.dll"
|
||||
PATTERN "platforms/qwindows.dll"
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
|
||||
Plugins = Plugins
|
||||
Translations = Resources/translations\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(GLOB_RECURSE QTPLUGINS
|
||||
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
|
||||
set(BU_CHMOD_BUNDLE_ITEMS ON)
|
||||
include(BundleUtilities)
|
||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -24,43 +24,46 @@ set(HEADERS
|
|||
include/card/card_relation/card_relation.h
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(cockatrice_card STATIC
|
||||
src/card_info.cpp
|
||||
src/card_info_comparator.cpp
|
||||
src/card_database/card_database.cpp
|
||||
src/card_database/card_database_loader.cpp
|
||||
src/card_database/card_database_manager.cpp
|
||||
src/card_database/card_database_querier.cpp
|
||||
src/card_database/model/card_database_model.cpp
|
||||
src/card_database/model/card_database_display_model.cpp
|
||||
src/card_database/model/card/card_completer_proxy_model.cpp
|
||||
src/card_database/model/card/card_search_model.cpp
|
||||
src/card_database/model/token/token_display_model.cpp
|
||||
src/card_database/model/token/token_edit_model.cpp
|
||||
src/card_database/parser/card_database_parser.cpp
|
||||
src/card_database/parser/cockatrice_xml_3.cpp
|
||||
src/card_database/parser/cockatrice_xml_4.cpp
|
||||
src/card_printing/exact_card.cpp
|
||||
src/card_printing/printing_info.cpp
|
||||
src/card_set/card_set.cpp
|
||||
src/card_set/card_set_list.cpp
|
||||
src/card_relation/card_relation.cpp
|
||||
${MOC_SOURCES}
|
||||
add_library(
|
||||
cockatrice_card STATIC
|
||||
${MOC_SOURCES}
|
||||
src/card_database/card_database.cpp
|
||||
src/card_database/card_database_loader.cpp
|
||||
src/card_database/card_database_manager.cpp
|
||||
src/card_database/card_database_querier.cpp
|
||||
src/card_database/model/card/card_completer_proxy_model.cpp
|
||||
src/card_database/model/card/card_search_model.cpp
|
||||
src/card_database/model/card_database_display_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_edit_model.cpp
|
||||
src/card_database/parser/card_database_parser.cpp
|
||||
src/card_database/parser/cockatrice_xml_3.cpp
|
||||
src/card_database/parser/cockatrice_xml_4.cpp
|
||||
src/card_info.cpp
|
||||
src/card_info_comparator.cpp
|
||||
src/card_printing/exact_card.cpp
|
||||
src/card_printing/printing_info.cpp
|
||||
src/card_relation/card_relation.cpp
|
||||
src/card_set/card_set.cpp
|
||||
src/card_set/card_set_list.cpp
|
||||
)
|
||||
|
||||
target_include_directories(cockatrice_card
|
||||
PUBLIC include
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
|
||||
target_include_directories(
|
||||
cockatrice_card
|
||||
PUBLIC include
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
|
||||
)
|
||||
|
||||
target_link_libraries(cockatrice_card
|
||||
PUBLIC cockatrice_settings
|
||||
PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
target_link_libraries(
|
||||
cockatrice_card
|
||||
PUBLIC cockatrice_settings
|
||||
PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,34 +3,23 @@ set(CMAKE_AUTOUIC ON)
|
|||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
include/deck_list/abstract_deck_list_card_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/abstract_deck_list_card_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
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(cockatrice_deck_list STATIC
|
||||
src/abstract_deck_list_card_node.cpp
|
||||
src/abstract_deck_list_node.cpp
|
||||
src/deck_list.cpp
|
||||
src/deck_list_card_node.cpp
|
||||
src/inner_deck_list_node.cpp
|
||||
${MOC_SOURCES}
|
||||
add_library(
|
||||
cockatrice_deck_list STATIC ${MOC_SOURCES} src/abstract_deck_list_card_node.cpp src/abstract_deck_list_node.cpp
|
||||
src/deck_list.cpp src/deck_list_card_node.cpp src/inner_deck_list_node.cpp
|
||||
)
|
||||
|
||||
add_dependencies(cockatrice_deck_list cockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(cockatrice_deck_list
|
||||
PUBLIC include
|
||||
)
|
||||
target_include_directories(cockatrice_deck_list PUBLIC include)
|
||||
|
||||
target_link_libraries(cockatrice_deck_list
|
||||
PUBLIC cockatrice_protocol_wrapper utility ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
target_link_libraries(cockatrice_deck_list PUBLIC cockatrice_protocol_wrapper utility ${COCKATRICE_QT_MODULES})
|
||||
|
|
|
|||
|
|
@ -2,16 +2,15 @@
|
|||
|
||||
add_subdirectory(pb)
|
||||
|
||||
add_library(cockatrice_protocol_wrapper STATIC
|
||||
# Optionally, you can add a dummy source if needed
|
||||
add_library(
|
||||
cockatrice_protocol_wrapper STATIC
|
||||
# Optionally, you can add a dummy source if needed
|
||||
)
|
||||
|
||||
# Link the actual generated protobuf library
|
||||
target_link_libraries(cockatrice_protocol_wrapper
|
||||
PUBLIC cockatrice_protocol
|
||||
)
|
||||
target_link_libraries(cockatrice_protocol_wrapper PUBLIC cockatrice_protocol)
|
||||
|
||||
# Expose the pb/ folder so consumers can do #include "pb/header.pb.h"
|
||||
target_include_directories(cockatrice_protocol_wrapper
|
||||
PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
|
||||
target_include_directories(
|
||||
cockatrice_protocol_wrapper PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
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), "
|
||||
"disabled the warnings 'unused-parameter' and 'misleading-indentation' for protobuf generated code "
|
||||
"to avoid compilation errors."
|
||||
"disabled the warnings 'unused-parameter' and 'misleading-indentation' for protobuf generated code "
|
||||
"to avoid compilation errors."
|
||||
)
|
||||
endif()
|
||||
else()
|
||||
|
|
@ -194,6 +194,6 @@ else()
|
|||
target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}")
|
||||
|
||||
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()
|
||||
|
|
|
|||
|
|
@ -2,29 +2,20 @@ set(CMAKE_AUTOMOC ON)
|
|||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
include/rng/rng_abstract.h
|
||||
include/rng/rng_sfmt.h
|
||||
include/rng/sfmt/SFMT.h
|
||||
set(HEADERS include/rng/rng_abstract.h include/rng/rng_sfmt.h include/rng/sfmt/SFMT.h)
|
||||
|
||||
if(Qt6_FOUND)
|
||||
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)
|
||||
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}
|
||||
)
|
||||
target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES})
|
||||
|
|
|
|||
|
|
@ -24,43 +24,46 @@ set(HEADERS
|
|||
include/server/serverinfo_user_container.h
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(cockatrice_server STATIC
|
||||
src/game/server_abstract_participant.cpp
|
||||
src/game/server_arrow.cpp
|
||||
src/game/server_arrowtarget.cpp
|
||||
src/game/server_card.cpp
|
||||
src/game/server_cardzone.cpp
|
||||
src/game/server_counter.cpp
|
||||
src/game/server_game.cpp
|
||||
src/game/server_player.cpp
|
||||
src/game/server_spectator.cpp
|
||||
src/debug_pb_message.cpp
|
||||
src/get_pb_extension.cpp
|
||||
src/server.cpp
|
||||
src/server_abstractuserinterface.cpp
|
||||
src/server_database_interface.cpp
|
||||
src/server_protocolhandler.cpp
|
||||
src/server_remoteuserinterface.cpp
|
||||
src/server_response_containers.cpp
|
||||
src/server_room.cpp
|
||||
src/serverinfo_user_container.cpp
|
||||
${MOC_SOURCES}
|
||||
add_library(
|
||||
cockatrice_server STATIC
|
||||
${MOC_SOURCES}
|
||||
src/debug_pb_message.cpp
|
||||
src/game/server_abstract_participant.cpp
|
||||
src/game/server_arrow.cpp
|
||||
src/game/server_arrowtarget.cpp
|
||||
src/game/server_card.cpp
|
||||
src/game/server_cardzone.cpp
|
||||
src/game/server_counter.cpp
|
||||
src/game/server_game.cpp
|
||||
src/game/server_player.cpp
|
||||
src/game/server_spectator.cpp
|
||||
src/get_pb_extension.cpp
|
||||
src/server.cpp
|
||||
src/server_abstractuserinterface.cpp
|
||||
src/server_database_interface.cpp
|
||||
src/server_protocolhandler.cpp
|
||||
src/server_remoteuserinterface.cpp
|
||||
src/server_response_containers.cpp
|
||||
src/server_room.cpp
|
||||
src/serverinfo_user_container.cpp
|
||||
)
|
||||
|
||||
add_dependencies(cockatrice_server cockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(cockatrice_server
|
||||
PUBLIC include
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||
target_include_directories(
|
||||
cockatrice_server
|
||||
PUBLIC include
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||
)
|
||||
|
||||
# Make cockatrice_server depend on cockatrice_protocol
|
||||
target_link_libraries(cockatrice_server
|
||||
PUBLIC cockatrice_common cockatrice_protocol_wrapper utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES}
|
||||
target_link_libraries(
|
||||
cockatrice_server PUBLIC cockatrice_common cockatrice_protocol_wrapper utility cockatrice_rng cockatrice_deck_list
|
||||
${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
@ -19,36 +19,36 @@ set(HEADERS
|
|||
include/settings/shortcuts_settings.h
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif()
|
||||
|
||||
add_library(cockatrice_settings STATIC
|
||||
src/cache_settings.cpp
|
||||
src/card_counter_settings.cpp
|
||||
src/card_database_settings.cpp
|
||||
src/card_override_settings.cpp
|
||||
src/debug_settings.cpp
|
||||
src/download_settings.cpp
|
||||
src/game_filters_settings.cpp
|
||||
src/layouts_settings.cpp
|
||||
src/message_settings.cpp
|
||||
src/recents_settings.cpp
|
||||
src/servers_settings.cpp
|
||||
src/settings_manager.cpp
|
||||
src/shortcut_treeview.cpp
|
||||
src/shortcuts_settings.cpp
|
||||
${MOC_SOURCES}
|
||||
add_library(
|
||||
cockatrice_settings STATIC
|
||||
${MOC_SOURCES}
|
||||
src/cache_settings.cpp
|
||||
src/card_counter_settings.cpp
|
||||
src/card_database_settings.cpp
|
||||
src/card_override_settings.cpp
|
||||
src/debug_settings.cpp
|
||||
src/download_settings.cpp
|
||||
src/game_filters_settings.cpp
|
||||
src/layouts_settings.cpp
|
||||
src/message_settings.cpp
|
||||
src/recents_settings.cpp
|
||||
src/servers_settings.cpp
|
||||
src/settings_manager.cpp
|
||||
src/shortcut_treeview.cpp
|
||||
src/shortcuts_settings.cpp
|
||||
)
|
||||
|
||||
target_include_directories(cockatrice_settings
|
||||
PUBLIC include
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
|
||||
target_include_directories(
|
||||
cockatrice_settings
|
||||
PUBLIC include
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
|
||||
)
|
||||
|
||||
target_link_libraries(cockatrice_settings
|
||||
PUBLIC cockatrice_common utility ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
target_link_libraries(cockatrice_settings PUBLIC cockatrice_common utility ${COCKATRICE_QT_MODULES})
|
||||
|
|
|
|||
|
|
@ -5,13 +5,8 @@ set(CMAKE_AUTOMOC ON)
|
|||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(UTILITY_SOURCES
|
||||
src/expression.cpp
|
||||
src/featureset.cpp
|
||||
src/key_signals.cpp
|
||||
src/levenshtein.cpp
|
||||
src/logger.cpp
|
||||
src/passwordhasher.cpp
|
||||
set(UTILITY_SOURCES src/expression.cpp src/featureset.cpp src/key_signals.cpp src/levenshtein.cpp src/logger.cpp
|
||||
src/passwordhasher.cpp
|
||||
)
|
||||
|
||||
set(UTILITY_HEADERS
|
||||
|
|
@ -26,18 +21,11 @@ set(UTILITY_HEADERS
|
|||
include/utility/trice_limits.h
|
||||
)
|
||||
|
||||
add_library(utility STATIC
|
||||
${UTILITY_SOURCES}
|
||||
${UTILITY_HEADERS}
|
||||
)
|
||||
add_library(utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS})
|
||||
|
||||
target_include_directories(utility
|
||||
PUBLIC include
|
||||
)
|
||||
target_include_directories(utility PUBLIC include)
|
||||
|
||||
target_link_libraries(utility
|
||||
PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
target_link_libraries(utility PUBLIC ${COCKATRICE_QT_MODULES})
|
||||
|
||||
set(ORACLE_LIBS)
|
||||
|
||||
|
|
|
|||
|
|
@ -44,12 +44,7 @@ endif()
|
|||
# ------------------------
|
||||
# Include directories
|
||||
# ------------------------
|
||||
include_directories(
|
||||
../libs/card/include
|
||||
../libs/settings/include
|
||||
../cockatrice/src
|
||||
../common
|
||||
)
|
||||
include_directories(../libs/card/include ../libs/settings/include ../cockatrice/src ../common)
|
||||
|
||||
# ------------------------
|
||||
# Optional libraries
|
||||
|
|
@ -79,13 +74,13 @@ endif()
|
|||
# ------------------------
|
||||
if(Qt6_FOUND)
|
||||
qt6_add_executable(
|
||||
oracle
|
||||
WIN32
|
||||
MACOSX_BUNDLE
|
||||
${oracle_SOURCES}
|
||||
${oracle_RESOURCES_RCC}
|
||||
${oracle_MOC_SRCS}
|
||||
MANUAL_FINALIZATION
|
||||
oracle
|
||||
WIN32
|
||||
MACOSX_BUNDLE
|
||||
${oracle_SOURCES}
|
||||
${oracle_RESOURCES_RCC}
|
||||
${oracle_MOC_SRCS}
|
||||
MANUAL_FINALIZATION
|
||||
)
|
||||
elseif(Qt5_FOUND)
|
||||
if(Qt5LinguistTools_FOUND)
|
||||
|
|
@ -103,10 +98,11 @@ endif()
|
|||
# ------------------------
|
||||
# Link libraries
|
||||
# ------------------------
|
||||
target_link_libraries(oracle
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE ${ORACLE_QT_MODULES}
|
||||
target_link_libraries(
|
||||
oracle
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE ${ORACLE_QT_MODULES}
|
||||
)
|
||||
|
||||
if(ZLIB_FOUND)
|
||||
|
|
@ -135,7 +131,7 @@ endif()
|
|||
|
||||
if(NOT WIN32 AND NOT APPLE)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR})
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
# ------------------------
|
||||
# Qt plugin handling
|
||||
|
|
@ -145,36 +141,36 @@ if(APPLE)
|
|||
set(qtconf_dest_dir oracle.app/Contents/Resources)
|
||||
|
||||
install(
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dSYM" EXCLUDE
|
||||
PATTERN "*_debug.dylib" EXCLUDE
|
||||
PATTERN "iconengines/*.dylib"
|
||||
PATTERN "platforms/*.dylib"
|
||||
PATTERN "styles/*.dylib"
|
||||
PATTERN "tls/*.dylib"
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dSYM" EXCLUDE
|
||||
PATTERN "*_debug.dylib" EXCLUDE
|
||||
PATTERN "iconengines/*.dylib"
|
||||
PATTERN "platforms/*.dylib"
|
||||
PATTERN "styles/*.dylib"
|
||||
PATTERN "tls/*.dylib"
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
|
||||
Plugins = Plugins
|
||||
Translations = Resources/translations\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(GLOB_RECURSE QTPLUGINS
|
||||
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
|
||||
set(BU_CHMOD_BUNDLE_ITEMS ON)
|
||||
include(BundleUtilities)
|
||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -184,49 +180,49 @@ if(WIN32)
|
|||
list(APPEND libSearchDirs ${QT_LIBRARY_DIR})
|
||||
|
||||
install(
|
||||
DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
|
||||
DESTINATION ./
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dll"
|
||||
DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
|
||||
DESTINATION ./
|
||||
FILES_MATCHING
|
||||
PATTERN "*.dll"
|
||||
)
|
||||
|
||||
install(
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "iconengines/qsvgicon.dll"
|
||||
PATTERN "platforms/qdirect2d.dll"
|
||||
PATTERN "platforms/qminimal.dll"
|
||||
PATTERN "platforms/qoffscreen.dll"
|
||||
PATTERN "platforms/qwindows.dll"
|
||||
PATTERN "styles/qcertonlybackend.dll"
|
||||
PATTERN "styles/qopensslbackend.dll"
|
||||
PATTERN "styles/qschannelbackend.dll"
|
||||
PATTERN "styles/qwindowsvistastyle.dll"
|
||||
PATTERN "tls/qcertonlybackend.dll"
|
||||
PATTERN "tls/qopensslbackend.dll"
|
||||
PATTERN "tls/qschannelbackend.dll"
|
||||
DIRECTORY "${QT_PLUGINS_DIR}/"
|
||||
DESTINATION ${plugin_dest_dir}
|
||||
COMPONENT Runtime
|
||||
FILES_MATCHING
|
||||
PATTERN "iconengines/qsvgicon.dll"
|
||||
PATTERN "platforms/qdirect2d.dll"
|
||||
PATTERN "platforms/qminimal.dll"
|
||||
PATTERN "platforms/qoffscreen.dll"
|
||||
PATTERN "platforms/qwindows.dll"
|
||||
PATTERN "styles/qcertonlybackend.dll"
|
||||
PATTERN "styles/qopensslbackend.dll"
|
||||
PATTERN "styles/qschannelbackend.dll"
|
||||
PATTERN "styles/qwindowsvistastyle.dll"
|
||||
PATTERN "tls/qcertonlybackend.dll"
|
||||
PATTERN "tls/qopensslbackend.dll"
|
||||
PATTERN "tls/qschannelbackend.dll"
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
|
||||
Plugins = Plugins
|
||||
Translations = Resources/translations\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
|
||||
install(
|
||||
CODE "
|
||||
CODE "
|
||||
file(GLOB_RECURSE QTPLUGINS
|
||||
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
|
||||
set(BU_CHMOD_BUNDLE_ITEMS ON)
|
||||
include(BundleUtilities)
|
||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\")
|
||||
"
|
||||
COMPONENT Runtime
|
||||
COMPONENT Runtime
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -237,10 +233,13 @@ if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
|
|||
if(UPDATE_TRANSLATIONS)
|
||||
file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp)
|
||||
qt6_add_translations(
|
||||
oracle
|
||||
TS_FILES ${oracle_TS}
|
||||
SOURCES ${translate_oracle_SRCS}
|
||||
QM_FILES_OUTPUT_VARIABLE oracle_QM
|
||||
oracle
|
||||
TS_FILES
|
||||
${oracle_TS}
|
||||
SOURCES
|
||||
${translate_oracle_SRCS}
|
||||
QM_FILES_OUTPUT_VARIABLE
|
||||
oracle_QM
|
||||
)
|
||||
else()
|
||||
qt6_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM)
|
||||
|
|
|
|||
|
|
@ -106,9 +106,19 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
|||
add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES})
|
||||
|
||||
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()
|
||||
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()
|
||||
|
||||
# install rules
|
||||
|
|
|
|||
|
|
@ -9,30 +9,23 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
|
|||
# ------------------------
|
||||
# Qt modules
|
||||
# ------------------------
|
||||
set(TEST_QT_MODULES
|
||||
${COCKATRICE_QT_VERSION_NAME}::Concurrent
|
||||
${COCKATRICE_QT_VERSION_NAME}::Network
|
||||
${COCKATRICE_QT_VERSION_NAME}::Widgets
|
||||
${COCKATRICE_QT_VERSION_NAME}::Svg
|
||||
set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
|
||||
${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg
|
||||
)
|
||||
|
||||
# ------------------------
|
||||
# Card Database Test
|
||||
# ------------------------
|
||||
add_executable(carddatabase_test
|
||||
${MOCKS_SOURCES}
|
||||
${VERSION_STRING_CPP}
|
||||
carddatabase_test.cpp
|
||||
mocks.cpp
|
||||
)
|
||||
add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddatabase_test.cpp mocks.cpp)
|
||||
|
||||
target_link_libraries(carddatabase_test
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE cockatrice_common
|
||||
PRIVATE Threads::Threads
|
||||
PRIVATE ${GTEST_BOTH_LIBRARIES}
|
||||
PRIVATE ${TEST_QT_MODULES}
|
||||
target_link_libraries(
|
||||
carddatabase_test
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE cockatrice_common
|
||||
PRIVATE Threads::Threads
|
||||
PRIVATE ${GTEST_BOTH_LIBRARIES}
|
||||
PRIVATE ${TEST_QT_MODULES}
|
||||
)
|
||||
|
||||
add_test(NAME carddatabase_test COMMAND carddatabase_test)
|
||||
|
|
@ -40,23 +33,25 @@ add_test(NAME carddatabase_test COMMAND carddatabase_test)
|
|||
# ------------------------
|
||||
# Filter String Test
|
||||
# ------------------------
|
||||
add_executable(filter_string_test
|
||||
${MOCKS_SOURCES}
|
||||
${VERSION_STRING_CPP}
|
||||
../../cockatrice/src/filters/filter_card.cpp
|
||||
../../cockatrice/src/filters/filter_string.cpp
|
||||
../../cockatrice/src/filters/filter_tree.cpp
|
||||
filter_string_test.cpp
|
||||
mocks.cpp
|
||||
add_executable(
|
||||
filter_string_test
|
||||
${MOCKS_SOURCES}
|
||||
${VERSION_STRING_CPP}
|
||||
../../cockatrice/src/filters/filter_card.cpp
|
||||
../../cockatrice/src/filters/filter_string.cpp
|
||||
../../cockatrice/src/filters/filter_tree.cpp
|
||||
filter_string_test.cpp
|
||||
mocks.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(filter_string_test
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE cockatrice_common
|
||||
PRIVATE Threads::Threads
|
||||
PRIVATE ${GTEST_BOTH_LIBRARIES}
|
||||
PRIVATE ${TEST_QT_MODULES}
|
||||
target_link_libraries(
|
||||
filter_string_test
|
||||
PRIVATE cockatrice_card
|
||||
PRIVATE cockatrice_settings
|
||||
PRIVATE cockatrice_common
|
||||
PRIVATE Threads::Threads
|
||||
PRIVATE ${GTEST_BOTH_LIBRARIES}
|
||||
PRIVATE ${TEST_QT_MODULES}
|
||||
)
|
||||
|
||||
add_test(NAME filter_string_test COMMAND filter_string_test)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
|
||||
add_executable(
|
||||
loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp
|
||||
)
|
||||
add_executable(loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp)
|
||||
|
||||
if(NOT GTEST_FOUND)
|
||||
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(
|
||||
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)
|
||||
|
|
|
|||
2
vcpkg
2
vcpkg
|
|
@ -1 +1 @@
|
|||
Subproject commit 29ff5b8131d0c6c8fcb8fbaef35992f0d507cd7c
|
||||
Subproject commit bb1ca2757bca8f8e372a4deb35943828e3b0d155
|
||||
Loading…
Add table
Add a link
Reference in a new issue