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

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

71
libs/card/CMakeLists.txt
View file

@ -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}
)

35
libs/deck_list/CMakeLists.txt
View file

@ -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})

13
libs/protocol/CMakeLists.txt
View file

@ -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
)

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
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()

39
libs/rng/CMakeLists.txt
View file

@ -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})

67
libs/server/CMakeLists.txt
View file

@ -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}
)

56
libs/settings/CMakeLists.txt
View file

@ -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})

22
libs/utility/CMakeLists.txt
View file

@ -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)