mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-14 14:32:15 -07:00
Finally, CMake linting.
Took 11 minutes Took 4 minutes
This commit is contained in:
parent
ecfcc078c4
commit
33cd0098f8
16 changed files with 302 additions and 311 deletions
|
|
@ -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)
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,7 @@
|
||||||
#
|
#
|
||||||
# provides the common library
|
# provides the common library
|
||||||
|
|
||||||
set(common_SOURCES
|
set(common_SOURCES)
|
||||||
)
|
|
||||||
|
|
||||||
set(ORACLE_LIBS)
|
set(ORACLE_LIBS)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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,7 +22,8 @@ add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
|
||||||
# ------------------------
|
# ------------------------
|
||||||
# Include directories
|
# Include directories
|
||||||
# ------------------------
|
# ------------------------
|
||||||
target_include_directories(dbconverter
|
target_include_directories(
|
||||||
|
dbconverter
|
||||||
PRIVATE ../common # shared common headers
|
PRIVATE ../common # shared common headers
|
||||||
PRIVATE ../libs/card/include # cockatrice_card public headers
|
PRIVATE ../libs/card/include # cockatrice_card public headers
|
||||||
)
|
)
|
||||||
|
|
@ -34,7 +31,8 @@ target_include_directories(dbconverter
|
||||||
# ------------------------
|
# ------------------------
|
||||||
# Link libraries
|
# Link libraries
|
||||||
# ------------------------
|
# ------------------------
|
||||||
target_link_libraries(dbconverter
|
target_link_libraries(
|
||||||
|
dbconverter
|
||||||
PRIVATE cockatrice_card
|
PRIVATE cockatrice_card
|
||||||
PRIVATE cockatrice_settings
|
PRIVATE cockatrice_settings
|
||||||
PRIVATE ${DB_CONVERTER_QT_MODULES}
|
PRIVATE ${DB_CONVERTER_QT_MODULES}
|
||||||
|
|
|
||||||
|
|
@ -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_database_display_model.cpp
|
|
||||||
src/card_database/model/card/card_completer_proxy_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/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_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_info.cpp
|
||||||
|
src/card_info_comparator.cpp
|
||||||
src/card_printing/exact_card.cpp
|
src/card_printing/exact_card.cpp
|
||||||
src/card_printing/printing_info.cpp
|
src/card_printing/printing_info.cpp
|
||||||
|
src/card_relation/card_relation.cpp
|
||||||
src/card_set/card_set.cpp
|
src/card_set/card_set.cpp
|
||||||
src/card_set/card_set_list.cpp
|
src/card_set/card_set_list.cpp
|
||||||
src/card_relation/card_relation.cpp
|
|
||||||
${MOC_SOURCES}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(cockatrice_card
|
target_include_directories(
|
||||||
|
cockatrice_card
|
||||||
PUBLIC include
|
PUBLIC include
|
||||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||||
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
|
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(cockatrice_card
|
target_link_libraries(
|
||||||
|
cockatrice_card
|
||||||
PUBLIC cockatrice_settings
|
PUBLIC cockatrice_settings
|
||||||
PUBLIC ${COCKATRICE_QT_MODULES}
|
PUBLIC ${COCKATRICE_QT_MODULES}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -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}
|
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,15 @@
|
||||||
|
|
||||||
add_subdirectory(pb)
|
add_subdirectory(pb)
|
||||||
|
|
||||||
add_library(cockatrice_protocol_wrapper STATIC
|
add_library(
|
||||||
|
cockatrice_protocol_wrapper STATIC
|
||||||
# Optionally, you can add a dummy source if needed
|
# 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
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
include/rng/sfmt/SFMT.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_rng STATIC
|
add_library(cockatrice_rng STATIC ${MOC_SOURCES} src/rng_abstract.cpp src/rng_sfmt.cpp src/sfmt/SFMT.c)
|
||||||
src/rng_abstract.cpp
|
|
||||||
src/rng_sfmt.cpp
|
|
||||||
src/sfmt/SFMT.c
|
|
||||||
${MOC_SOURCES}
|
|
||||||
)
|
|
||||||
|
|
||||||
target_include_directories(cockatrice_rng
|
target_include_directories(
|
||||||
|
cockatrice_rng
|
||||||
PUBLIC include
|
PUBLIC include
|
||||||
PUBLIC include/sfmt
|
PUBLIC include/sfmt
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}
|
target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES})
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -24,13 +24,16 @@ 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(
|
||||||
|
cockatrice_server STATIC
|
||||||
|
${MOC_SOURCES}
|
||||||
|
src/debug_pb_message.cpp
|
||||||
src/game/server_abstract_participant.cpp
|
src/game/server_abstract_participant.cpp
|
||||||
src/game/server_arrow.cpp
|
src/game/server_arrow.cpp
|
||||||
src/game/server_arrowtarget.cpp
|
src/game/server_arrowtarget.cpp
|
||||||
|
|
@ -40,7 +43,6 @@ add_library(cockatrice_server STATIC
|
||||||
src/game/server_game.cpp
|
src/game/server_game.cpp
|
||||||
src/game/server_player.cpp
|
src/game/server_player.cpp
|
||||||
src/game/server_spectator.cpp
|
src/game/server_spectator.cpp
|
||||||
src/debug_pb_message.cpp
|
|
||||||
src/get_pb_extension.cpp
|
src/get_pb_extension.cpp
|
||||||
src/server.cpp
|
src/server.cpp
|
||||||
src/server_abstractuserinterface.cpp
|
src/server_abstractuserinterface.cpp
|
||||||
|
|
@ -50,17 +52,18 @@ add_library(cockatrice_server STATIC
|
||||||
src/server_response_containers.cpp
|
src/server_response_containers.cpp
|
||||||
src/server_room.cpp
|
src/server_room.cpp
|
||||||
src/serverinfo_user_container.cpp
|
src/serverinfo_user_container.cpp
|
||||||
${MOC_SOURCES}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_dependencies(cockatrice_server cockatrice_protocol_wrapper)
|
add_dependencies(cockatrice_server cockatrice_protocol_wrapper)
|
||||||
|
|
||||||
target_include_directories(cockatrice_server
|
target_include_directories(
|
||||||
|
cockatrice_server
|
||||||
PUBLIC include
|
PUBLIC include
|
||||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
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}
|
||||||
)
|
)
|
||||||
|
|
@ -19,13 +19,15 @@ 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(
|
||||||
|
cockatrice_settings STATIC
|
||||||
|
${MOC_SOURCES}
|
||||||
src/cache_settings.cpp
|
src/cache_settings.cpp
|
||||||
src/card_counter_settings.cpp
|
src/card_counter_settings.cpp
|
||||||
src/card_database_settings.cpp
|
src/card_database_settings.cpp
|
||||||
|
|
@ -40,15 +42,13 @@ add_library(cockatrice_settings STATIC
|
||||||
src/settings_manager.cpp
|
src/settings_manager.cpp
|
||||||
src/shortcut_treeview.cpp
|
src/shortcut_treeview.cpp
|
||||||
src/shortcuts_settings.cpp
|
src/shortcuts_settings.cpp
|
||||||
${MOC_SOURCES}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(cockatrice_settings
|
target_include_directories(
|
||||||
|
cockatrice_settings
|
||||||
PUBLIC include
|
PUBLIC include
|
||||||
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
PUBLIC ${CMAKE_SOURCE_DIR}/common
|
||||||
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
|
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}
|
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,7 @@ 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/featureset.cpp
|
|
||||||
src/key_signals.cpp
|
|
||||||
src/levenshtein.cpp
|
|
||||||
src/logger.cpp
|
|
||||||
src/passwordhasher.cpp
|
src/passwordhasher.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -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)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
@ -103,7 +98,8 @@ endif()
|
||||||
# ------------------------
|
# ------------------------
|
||||||
# Link libraries
|
# Link libraries
|
||||||
# ------------------------
|
# ------------------------
|
||||||
target_link_libraries(oracle
|
target_link_libraries(
|
||||||
|
oracle
|
||||||
PRIVATE cockatrice_card
|
PRIVATE cockatrice_card
|
||||||
PRIVATE cockatrice_settings
|
PRIVATE cockatrice_settings
|
||||||
PRIVATE ${ORACLE_QT_MODULES}
|
PRIVATE ${ORACLE_QT_MODULES}
|
||||||
|
|
@ -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
|
||||||
|
|
@ -238,9 +234,12 @@ if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
|
||||||
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)
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -9,24 +9,17 @@ 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(
|
||||||
|
carddatabase_test
|
||||||
PRIVATE cockatrice_card
|
PRIVATE cockatrice_card
|
||||||
PRIVATE cockatrice_settings
|
PRIVATE cockatrice_settings
|
||||||
PRIVATE cockatrice_common
|
PRIVATE cockatrice_common
|
||||||
|
|
@ -40,7 +33,8 @@ add_test(NAME carddatabase_test COMMAND carddatabase_test)
|
||||||
# ------------------------
|
# ------------------------
|
||||||
# Filter String Test
|
# Filter String Test
|
||||||
# ------------------------
|
# ------------------------
|
||||||
add_executable(filter_string_test
|
add_executable(
|
||||||
|
filter_string_test
|
||||||
${MOCKS_SOURCES}
|
${MOCKS_SOURCES}
|
||||||
${VERSION_STRING_CPP}
|
${VERSION_STRING_CPP}
|
||||||
../../cockatrice/src/filters/filter_card.cpp
|
../../cockatrice/src/filters/filter_card.cpp
|
||||||
|
|
@ -50,7 +44,8 @@ add_executable(filter_string_test
|
||||||
mocks.cpp
|
mocks.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(filter_string_test
|
target_link_libraries(
|
||||||
|
filter_string_test
|
||||||
PRIVATE cockatrice_card
|
PRIVATE cockatrice_card
|
||||||
PRIVATE cockatrice_settings
|
PRIVATE cockatrice_settings
|
||||||
PRIVATE cockatrice_common
|
PRIVATE cockatrice_common
|
||||||
|
|
|
||||||
|
|
@ -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
2
vcpkg
|
|
@ -1 +1 @@
|
||||||
Subproject commit 29ff5b8131d0c6c8fcb8fbaef35992f0d507cd7c
|
Subproject commit bb1ca2757bca8f8e372a4deb35943828e3b0d155
|
||||||
Loading…
Add table
Add a link
Reference in a new issue