From eb7c4cae6ce2ad9e803fc1f431acbfaaa1dd8b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 8 Oct 2025 13:48:21 +0200 Subject: [PATCH] Move pending command, adjust CmakeLists. Took 24 minutes --- cockatrice/CMakeLists.txt | 2 +- cockatrice/src/dialogs/dlg_create_game.cpp | 2 +- .../src/game/deckview/deck_view_container.cpp | 2 +- cockatrice/src/game/game_event_handler.cpp | 2 +- cockatrice/src/game/zones/view_zone.cpp | 4 +-- cockatrice/src/server/game_selector.cpp | 2 +- .../remote/remote_decklist_tree_widget.cpp | 2 +- .../remote/remote_replay_list_tree_widget.cpp | 2 +- .../src/server/user/user_context_menu.cpp | 2 +- cockatrice/src/server/user/user_info_box.cpp | 2 +- .../src/server/user/user_list_manager.cpp | 2 +- .../src/server/user/user_list_widget.cpp | 2 +- .../src/tabs/abstract_tab_deck_editor.cpp | 2 +- cockatrice/src/tabs/tab_account.cpp | 2 +- cockatrice/src/tabs/tab_admin.cpp | 2 +- cockatrice/src/tabs/tab_deck_editor.cpp | 2 +- cockatrice/src/tabs/tab_deck_storage.cpp | 2 +- cockatrice/src/tabs/tab_logs.cpp | 2 +- cockatrice/src/tabs/tab_message.cpp | 2 +- cockatrice/src/tabs/tab_replays.cpp | 2 +- cockatrice/src/tabs/tab_room.cpp | 2 +- cockatrice/src/tabs/tab_server.cpp | 2 +- .../tab_deck_editor_visual.cpp | 2 +- libcockatrice_deck_list/CMakeLists.txt | 4 +-- .../client/abstract/CMakeLists.txt | 4 ++- .../client/abstract/abstract_client.cpp | 2 +- .../client/remote/remote_client.cpp | 2 +- libcockatrice_protocol/CMakeLists.txt | 27 +++++++++++++--- .../libcockatrice/protocol/CMakeLists.txt | 32 +++++++++++++++++++ .../libcockatrice/protocol/pb/CMakeLists.txt | 16 +++++----- .../protocol}/pending_command.cpp | 0 .../libcockatrice/protocol}/pending_command.h | 0 libcockatrice_server/CMakeLists.txt | 4 +-- 33 files changed, 96 insertions(+), 43 deletions(-) create mode 100644 libcockatrice_protocol/libcockatrice/protocol/CMakeLists.txt rename {cockatrice/src/server => libcockatrice_protocol/libcockatrice/protocol}/pending_command.cpp (100%) rename {cockatrice/src/server => libcockatrice_protocol/libcockatrice/protocol}/pending_command.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 96d85584c..94b5edce8 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -213,7 +213,7 @@ set(cockatrice_SOURCES ../libcockatrice_network/libcockatrice/client/local/local_client.cpp ../libcockatrice_network/libcockatrice/server/local/local_server.cpp ../libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp - src/server/pending_command.cpp + ../libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp ../libcockatrice_network/libcockatrice/client/remote/remote_client.cpp src/server/remote/remote_decklist_tree_widget.cpp src/server/remote/remote_replay_list_tree_widget.cpp diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp index 73bb4d72c..96b87709b 100644 --- a/cockatrice/src/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/dialogs/dlg_create_game.cpp @@ -1,6 +1,6 @@ #include "dlg_create_game.h" -#include "../server/pending_command.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../tabs/tab_room.h" #include diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 3f2d6d483..a2b5ee4d7 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,12 +1,12 @@ #include "deck_view_container.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../deck/deck_loader.h" #include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../dialogs/dlg_load_deck_from_website.h" #include "../../dialogs/dlg_load_remote_deck.h" #include "../../interface/card_picture_loader/card_picture_loader.h" -#include "../../server/pending_command.h" #include "../../tabs/tab_game.h" #include "../game_scene.h" #include "deck_view.h" diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index 649ad9237..76cefbec0 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -1,7 +1,7 @@ #include "game_event_handler.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" -#include "../server/pending_command.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../tabs/tab_game.h" #include "abstract_game.h" #include "log/message_log_widget.h" diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index d6cb3e0ae..4b9b741e5 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -1,6 +1,6 @@ #include "view_zone.h" -#include "../../server/pending_command.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" @@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r) qobject_cast(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE); reorganizeCards(); - emit getLogic()->cardCountChanged(); + emit getLogic() -> cardCountChanged(); } // Because of boundingRect(), this function must not be called before the zone was added to a scene. diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp index 76b85254d..dc3b4bf10 100644 --- a/cockatrice/src/server/game_selector.cpp +++ b/cockatrice/src/server/game_selector.cpp @@ -1,6 +1,7 @@ #include "game_selector.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../client/get_text_with_max.h" #include "../dialogs/dlg_create_game.h" #include "../dialogs/dlg_filter_games.h" @@ -9,7 +10,6 @@ #include "../tabs/tab_room.h" #include "../tabs/tab_supervisor.h" #include "games_model.h" -#include "pending_command.h" #include "user/user_list_manager.h" #include diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp index f77d6f7e8..5a6a2d48d 100644 --- a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp +++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp @@ -1,7 +1,7 @@ #include "remote_decklist_tree_widget.h" #include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" -#include "../pending_command.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include #include diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp index 06820cf0f..da4249fa4 100644 --- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp +++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp @@ -1,7 +1,7 @@ #include "remote_replay_list_tree_widget.h" #include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" -#include "../pending_command.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include #include diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp index feed044c2..b869b6fec 100644 --- a/cockatrice/src/server/user/user_context_menu.cpp +++ b/cockatrice/src/server/user/user_context_menu.cpp @@ -1,12 +1,12 @@ #include "user_context_menu.h" #include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../tabs/tab_account.h" #include "../../tabs/tab_game.h" #include "../../tabs/tab_supervisor.h" #include "../chat_view/chat_view.h" #include "../game_selector.h" -#include "../pending_command.h" #include "user_info_box.h" #include "user_list_manager.h" #include "user_list_proxy.h" diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index 4cabd2c23..9f7a540fb 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/cockatrice/src/server/user/user_info_box.cpp @@ -1,12 +1,12 @@ #include "user_info_box.h" #include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../client/get_text_with_max.h" #include "../../dialogs/dlg_edit_avatar.h" #include "../../dialogs/dlg_edit_password.h" #include "../../dialogs/dlg_edit_user.h" #include "../../interface/pixel_map_generator.h" -#include "../pending_command.h" #include #include diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp index 7e1eb38ae..0f188b8c1 100644 --- a/cockatrice/src/server/user/user_list_manager.cpp +++ b/cockatrice/src/server/user/user_list_manager.cpp @@ -1,8 +1,8 @@ #include "user_list_manager.h" #include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../client/sound_engine.h" -#include "../pending_command.h" #include "user_info_box.h" #include diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp index 605d73b97..07c27c981 100644 --- a/cockatrice/src/server/user/user_list_widget.cpp +++ b/cockatrice/src/server/user/user_list_widget.cpp @@ -1,11 +1,11 @@ #include "user_list_widget.h" #include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../interface/pixel_map_generator.h" #include "../../tabs/tab_account.h" #include "../../tabs/tab_supervisor.h" #include "../game_selector.h" -#include "../pending_command.h" #include "user_context_menu.h" #include "user_list_manager.h" diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp index 9c5246583..0670db93d 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp @@ -1,6 +1,7 @@ #include "abstract_tab_deck_editor.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../client/tapped_out_interface.h" #include "../deck/deck_stats_interface.h" #include "../dialogs/dlg_load_deck.h" @@ -9,7 +10,6 @@ #include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/pixel_map_generator.h" #include "../interface/widgets/cards/card_info_frame_widget.h" -#include "../server/pending_command.h" #include "tab_supervisor.h" #include diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp index a1e81fc43..ef46a25f5 100644 --- a/cockatrice/src/tabs/tab_account.cpp +++ b/cockatrice/src/tabs/tab_account.cpp @@ -1,9 +1,9 @@ #include "tab_account.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../client/sound_engine.h" #include "../deck/custom_line_edit.h" -#include "../server/pending_command.h" #include "../server/user/user_info_box.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp index 887ab0007..3c4728652 100644 --- a/cockatrice/src/tabs/tab_admin.cpp +++ b/cockatrice/src/tabs/tab_admin.cpp @@ -1,7 +1,7 @@ #include "tab_admin.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" -#include "../server/pending_command.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include #include diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index 33dbc9e8e..cb082091e 100644 --- a/cockatrice/src/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/tabs/tab_deck_editor.cpp @@ -1,6 +1,7 @@ #include "tab_deck_editor.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../client/deck_editor_menu.h" #include "../client/tapped_out_interface.h" #include "../dialogs/dlg_load_deck.h" @@ -10,7 +11,6 @@ #include "../interface/pixel_map_generator.h" #include "../interface/widgets/cards/card_info_frame_widget.h" #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" -#include "../server/pending_command.h" #include "tab_supervisor.h" #include diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp index 181e6b3a4..4f377e87d 100644 --- a/cockatrice/src/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/tabs/tab_deck_storage.cpp @@ -1,8 +1,8 @@ #include "tab_deck_storage.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../client/get_text_with_max.h" #include "../deck/deck_loader.h" -#include "../server/pending_command.h" #include "../server/remote/remote_decklist_tree_widget.h" #include diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp index b5e593b76..228b6c552 100644 --- a/cockatrice/src/tabs/tab_logs.cpp +++ b/cockatrice/src/tabs/tab_logs.cpp @@ -1,9 +1,9 @@ #include "tab_logs.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../deck/custom_line_edit.h" #include "../dialogs/dlg_manage_sets.h" -#include "../server/pending_command.h" #include #include diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp index 4a064bc38..d73776f2f 100644 --- a/cockatrice/src/tabs/tab_message.cpp +++ b/cockatrice/src/tabs/tab_message.cpp @@ -1,11 +1,11 @@ #include "tab_message.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../client/sound_engine.h" #include "../deck/custom_line_edit.h" #include "../main.h" #include "../server/chat_view/chat_view.h" -#include "../server/pending_command.h" #include "../server/user/user_list_manager.h" #include diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp index f758d2fd1..ad5287a13 100644 --- a/cockatrice/src/tabs/tab_replays.cpp +++ b/cockatrice/src/tabs/tab_replays.cpp @@ -1,7 +1,7 @@ #include "tab_replays.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" -#include "../server/pending_command.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../server/remote/remote_replay_list_tree_widget.h" #include "tab_game.h" diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp index 117f6a0fc..08799f84e 100644 --- a/cockatrice/src/tabs/tab_room.cpp +++ b/cockatrice/src/tabs/tab_room.cpp @@ -1,11 +1,11 @@ #include "tab_room.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../dialogs/dlg_settings.h" #include "../main.h" #include "../server/chat_view/chat_view.h" #include "../server/game_selector.h" -#include "../server/pending_command.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" #include "tab_account.h" diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp index 23bcc23c2..afc9644d5 100644 --- a/cockatrice/src/tabs/tab_server.cpp +++ b/cockatrice/src/tabs/tab_server.cpp @@ -1,7 +1,7 @@ #include "tab_server.h" #include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" -#include "../server/pending_command.h" +#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../server/user/user_list_widget.h" #include "tab_supervisor.h" diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 57668ac18..dd67a1ae3 100644 --- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -1,5 +1,6 @@ #include "tab_deck_editor_visual.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../deck/deck_list_model.h" #include "../../deck/deck_stats_interface.h" #include "../../filters/filter_builder.h" @@ -7,7 +8,6 @@ #include "../../interface/widgets/cards/card_info_frame_widget.h" #include "../../interface/widgets/deck_analytics/deck_analytics_widget.h" #include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h" -#include "../../server/pending_command.h" #include "../tab_deck_editor.h" #include "../tab_supervisor.h" #include "tab_deck_editor_visual_tab_widget.h" diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt index 5ba0b32c9..bdf03c058 100644 --- a/libcockatrice_deck_list/CMakeLists.txt +++ b/libcockatrice_deck_list/CMakeLists.txt @@ -21,10 +21,10 @@ add_library( libcockatrice/deck_list/deck_list_card_node.cpp libcockatrice/deck_list/inner_deck_list_node.cpp ) -add_dependencies(libcockatrice_deck_list libcockatrice_protocol_wrapper) +add_dependencies(libcockatrice_deck_list libcockatrice_protocol) target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_deck_list PUBLIC libcockatrice_protocol_wrapper libcockatrice_utility ${COCKATRICE_QT_MODULES} + libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${COCKATRICE_QT_MODULES} ) diff --git a/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt index dbf39a176..675e78de1 100644 --- a/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt @@ -22,8 +22,10 @@ add_library( ${SOURCES} ) +add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol) + target_include_directories(libcockatrice_network_client_abstract PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} + libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol ) diff --git a/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp index 15e705c26..20b3631f5 100644 --- a/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp +++ b/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp @@ -1,6 +1,6 @@ #include "abstract_client.h" -#include "../../../../cockatrice/src/server/pending_command.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include #include diff --git a/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp index 86ecb871c..2a4fae82e 100644 --- a/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp +++ b/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp @@ -1,7 +1,7 @@ #include "remote_client.h" #include "../../../../cockatrice/src/main.h" -#include "../../../../cockatrice/src/server/pending_command.h" +#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "version_string.h" #include diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt index 42c2af503..4bd984c25 100644 --- a/libcockatrice_protocol/CMakeLists.txt +++ b/libcockatrice_protocol/CMakeLists.txt @@ -2,12 +2,31 @@ add_subdirectory(libcockatrice/protocol/pb) -add_library(libcockatrice_protocol_wrapper STATIC) +add_library(libcockatrice_protocol STATIC) + +set(SOURCES + libcockatrice/protocol/pending_command.cpp +) + +set(HEADERS + libcockatrice/protocol/pending_command.h +) + +target_sources(libcockatrice_protocol + PRIVATE + ${SOURCES} + ${HEADERS} +) + +add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb) # Link the actual generated protobuf library -target_link_libraries(libcockatrice_protocol_wrapper PUBLIC libcockatrice_protocol) +target_link_libraries(libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb) -# Expose the pb/ folder so consumers can do #include +# Expose include paths target_include_directories( - libcockatrice_protocol_wrapper PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers + libcockatrice_protocol + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers ) diff --git a/libcockatrice_protocol/libcockatrice/protocol/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/CMakeLists.txt new file mode 100644 index 000000000..cc7536c79 --- /dev/null +++ b/libcockatrice_protocol/libcockatrice/protocol/CMakeLists.txt @@ -0,0 +1,32 @@ +# Top-level wrapper for the protobuf library + +add_subdirectory(pb) + +add_library(libcockatrice_protocol STATIC) + +set(SOURCES + pending_command.cpp +) + +set(HEADERS + pending_command.h +) + +target_sources(libcockatrice_protocol + PRIVATE + ${SOURCES} + ${HEADERS} +) + +add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb) + +# Link the actual generated protobuf library +target_link_libraries(libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb) + +# Expose include paths +target_include_directories( + libcockatrice_protocol + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/pb # generated pb headers +) diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt index 2d3051863..32e7f3238 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt @@ -171,12 +171,12 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0") include_directories(${CMAKE_CURRENT_BINARY_DIR}) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) - add_library(libcockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) - set(libcockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES}) + add_library(libcockatrice_protocol_pb ${PROTO_SRCS} ${PROTO_HDRS}) + set(libcockatrice_protocol_pb_LIBS ${PROTOBUF_LIBRARIES}) if(UNIX) - set(libcockatrice_protocol_LIBS ${libcockatrice_protocol_LIBS} -lpthread) + set(libcockatrice_protocol_pb_LIBS ${libcockatrice_protocol_pb_LIBS} -lpthread) endif(UNIX) - target_link_libraries(libcockatrice_protocol ${libcockatrice_protocol_LIBS}) + target_link_libraries(libcockatrice_protocol_pb ${libcockatrice_protocol_pb_LIBS}) # ubuntu uses an outdated package for protobuf, 3.1.0 is required if(${Protobuf_VERSION} VERSION_LESS "3.1.0") @@ -188,10 +188,10 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0") ) endif() else() - add_library(libcockatrice_protocol ${PROTO_FILES}) - target_link_libraries(libcockatrice_protocol PUBLIC protobuf::libprotobuf) + add_library(libcockatrice_protocol_pb ${PROTO_FILES}) + target_link_libraries(libcockatrice_protocol_pb PUBLIC protobuf::libprotobuf) set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") - target_include_directories(libcockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}") + target_include_directories(libcockatrice_protocol_pb PUBLIC "${PROTOBUF_INCLUDE_DIRS}") - protobuf_generate(TARGET libcockatrice_protocol IMPORT_DIRS "." PROTOC_OUT_DIR "${PROTO_BINARY_DIR}") + protobuf_generate(TARGET libcockatrice_protocol_pb IMPORT_DIRS "." PROTOC_OUT_DIR "${PROTO_BINARY_DIR}") endif() diff --git a/cockatrice/src/server/pending_command.cpp b/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp similarity index 100% rename from cockatrice/src/server/pending_command.cpp rename to libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp diff --git a/cockatrice/src/server/pending_command.h b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h similarity index 100% rename from cockatrice/src/server/pending_command.h rename to libcockatrice_protocol/libcockatrice/protocol/pending_command.h diff --git a/libcockatrice_server/CMakeLists.txt b/libcockatrice_server/CMakeLists.txt index 6d78625c6..693538c52 100644 --- a/libcockatrice_server/CMakeLists.txt +++ b/libcockatrice_server/CMakeLists.txt @@ -56,12 +56,12 @@ add_library( libcockatrice/server/serverinfo_user_container.cpp ) -add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) +add_dependencies(libcockatrice_server libcockatrice_protocol) target_include_directories(libcockatrice_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) # Make cockatrice_server depend on cockatrice_protocol target_link_libraries( - libcockatrice_server PUBLIC libcockatrice_protocol_wrapper libcockatrice_utility libcockatrice_rng + libcockatrice_server PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng libcockatrice_deck_list ${COCKATRICE_QT_MODULES} )