From c5bf87dfede5f45619b33aed7108d7423e756d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 8 Oct 2025 13:24:16 +0200 Subject: [PATCH] Adjust cmakelists. Took 6 minutes --- libcockatrice_network/CMakeLists.txt | 23 +++------------- .../libcockatrice/client/CMakeLists.txt | 26 +++++-------------- .../client/abstract/CMakeLists.txt | 12 ++++----- .../client/abstract/abstract_client.cpp | 2 +- .../libcockatrice/client/local/CMakeLists.txt | 4 +-- .../client/remote/CMakeLists.txt | 12 ++++----- .../libcockatrice/server/local/CMakeLists.txt | 14 +++++----- 7 files changed, 31 insertions(+), 62 deletions(-) diff --git a/libcockatrice_network/CMakeLists.txt b/libcockatrice_network/CMakeLists.txt index 05d8e9021..7e78bc0b7 100644 --- a/libcockatrice_network/CMakeLists.txt +++ b/libcockatrice_network/CMakeLists.txt @@ -2,30 +2,15 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -set(HEADERS - local_client.h -) - -set(SOURCES - local_client.cpp -) - -if (Qt6_FOUND) - qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) -elseif (Qt5_FOUND) - qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) -endif () +add_subdirectory(libcockatrice/client) add_library( - libcockatrice_network_client_local STATIC - ${MOC_SOURCES} - ${SOURCES} + libcockatrice_network INTERFACE ) -# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) -target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(libcockatrice_network PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} + libcockatrice_network PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client ) diff --git a/libcockatrice_network/libcockatrice/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/CMakeLists.txt index 411b024c1..60df27928 100644 --- a/libcockatrice_network/libcockatrice/client/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/client/CMakeLists.txt @@ -2,30 +2,16 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -set(HEADERS - abstract/abstract_client.h -) - -set(SOURCES - abstract/abstract_client.cpp -) - -if (Qt6_FOUND) - qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) -elseif (Qt5_FOUND) - qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) -endif () +add_subdirectory(abstract) +add_subdirectory(local) +add_subdirectory(remote) add_library( - libcockatrice_network_client STATIC - ${MOC_SOURCES} - ${SOURCES} + libcockatrice_network_client INTERFACE ) -# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) - -target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(libcockatrice_network_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} + libcockatrice_network_client PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local libcockatrice_network_client_remote ) diff --git a/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt index 05d8e9021..dbf39a176 100644 --- a/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt @@ -3,11 +3,11 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(HEADERS - local_client.h + abstract_client.h ) set(SOURCES - local_client.cpp + abstract_client.cpp ) if (Qt6_FOUND) @@ -17,15 +17,13 @@ elseif (Qt5_FOUND) endif () add_library( - libcockatrice_network_client_local STATIC + libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES} ) -# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) - -target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(libcockatrice_network_client_abstract PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} + libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} ) diff --git a/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp index 30f3281b2..15e705c26 100644 --- a/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp +++ b/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp @@ -1,4 +1,4 @@ -#include "../../../cockatrice/src/server/abstract_client.h" +#include "abstract_client.h" #include "../../../../cockatrice/src/server/pending_command.h" diff --git a/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt index 05d8e9021..2315d30a4 100644 --- a/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt @@ -22,10 +22,10 @@ add_library( ${SOURCES} ) -# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) +add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract) target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} + libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract ) diff --git a/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt index 05d8e9021..f344c9633 100644 --- a/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt @@ -3,11 +3,11 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(HEADERS - local_client.h + remote_client.h ) set(SOURCES - local_client.cpp + remote_client.cpp ) if (Qt6_FOUND) @@ -17,15 +17,15 @@ elseif (Qt5_FOUND) endif () add_library( - libcockatrice_network_client_local STATIC + libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES} ) -# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) +add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract) -target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(libcockatrice_network_client_remote PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} + libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract ) diff --git a/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt index 05d8e9021..7e93d7461 100644 --- a/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt @@ -3,11 +3,13 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(HEADERS - local_client.h + local_server.h + local_server_interface.h ) set(SOURCES - local_client.cpp + local_server.cpp + local_server_interface.cpp ) if (Qt6_FOUND) @@ -17,15 +19,13 @@ elseif (Qt5_FOUND) endif () add_library( - libcockatrice_network_client_local STATIC + libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES} ) -# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) - -target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(libcockatrice_network_server_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} + libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} )