From 7d2700ca652834337884ad17ad629a598f65b8d4 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Tue, 11 Nov 2025 14:04:14 +0100 Subject: [PATCH] Clean up link targets. (#6304) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Took 38 minutes Co-authored-by: Lukas Brübach --- .../libcockatrice/models/database/CMakeLists.txt | 4 +--- .../libcockatrice/models/deck_list/CMakeLists.txt | 2 +- .../libcockatrice/network/client/CMakeLists.txt | 6 ++++-- .../libcockatrice/network/client/abstract/CMakeLists.txt | 5 +++-- .../libcockatrice/network/client/local/CMakeLists.txt | 4 +++- .../libcockatrice/network/client/remote/CMakeLists.txt | 5 +++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt index dd290fd1d..950d6d79f 100644 --- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt +++ b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt @@ -32,6 +32,4 @@ add_library( target_include_directories(libcockatrice_models_database PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries( - libcockatrice_models_database PUBLIC libcockatrice_card libcockatrice_filters ${COCKATRICE_QT_MODULES} -) +target_link_libraries(libcockatrice_models_database PUBLIC libcockatrice_card libcockatrice_filters ${QT_CORE_MODULE}) diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt index ef66feaf2..851636a35 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt +++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt @@ -17,5 +17,5 @@ add_library( target_include_directories(libcockatrice_models_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_models_deck_list PUBLIC libcockatrice_card libcockatrice_deck_list ${COCKATRICE_QT_MODULES} + libcockatrice_models_deck_list PUBLIC libcockatrice_card libcockatrice_deck_list ${QT_CORE_MODULE} ) diff --git a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt index d86210edd..bcf62463c 100644 --- a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt @@ -11,6 +11,8 @@ add_library(libcockatrice_network_client INTERFACE) target_include_directories(libcockatrice_network_client INTERFACE .) target_link_libraries( - libcockatrice_network_client INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract - libcockatrice_network_client_local libcockatrice_network_client_remote + libcockatrice_network_client + INTERFACE ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets + libcockatrice_network_client_abstract libcockatrice_network_client_local + libcockatrice_network_client_remote ) diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt index 54e4d83e0..2753246de 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt @@ -19,6 +19,7 @@ add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol li target_include_directories(libcockatrice_network_client_abstract PUBLIC .) target_link_libraries( - libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol - libcockatrice_network_server_remote + libcockatrice_network_client_abstract + PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets libcockatrice_protocol + libcockatrice_network_server_remote ) diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt index 3c202904d..d12a324dc 100644 --- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt @@ -19,5 +19,7 @@ add_dependencies(libcockatrice_network_client_local libcockatrice_network_client target_include_directories(libcockatrice_network_client_local PUBLIC .) target_link_libraries( - libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract + libcockatrice_network_client_local + PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets + libcockatrice_network_client_abstract ) diff --git a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt index d70065330..0548700e4 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt @@ -19,6 +19,7 @@ add_dependencies(libcockatrice_network_client_remote libcockatrice_network_clien target_include_directories(libcockatrice_network_client_remote PUBLIC .) target_link_libraries( - libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract - libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol + libcockatrice_network_client_remote + PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets + libcockatrice_network_client_abstract libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol )