From 2ce855cb174e1ab1e60d79b5fe502184c2b8d60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sat, 4 Oct 2025 20:30:51 +0200 Subject: [PATCH] Properly name lib targets. Took 24 minutes --- CMakeLists.txt | 7 +++++++ cockatrice/CMakeLists.txt | 11 ++--------- dbconverter/CMakeLists.txt | 6 +++--- libs/card/CMakeLists.txt | 8 ++++---- libs/server/CMakeLists.txt | 8 ++++---- libs/settings/CMakeLists.txt | 6 +++--- oracle/CMakeLists.txt | 4 ++-- servatrice/CMakeLists.txt | 4 ++-- servatrice/src/servatrice_database_interface.cpp | 2 +- tests/carddatabase/CMakeLists.txt | 8 ++++---- tests/loading_from_clipboard/CMakeLists.txt | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34afff90b..8baa75eb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,6 +327,13 @@ endif() include(CPack) add_subdirectory(common) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/deck_list ${CMAKE_BINARY_DIR}/libs/deck_list) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/rng ${CMAKE_BINARY_DIR}/libs/rng) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/utility ${CMAKE_BINARY_DIR}/libs/utility) if(WITH_SERVER) add_subdirectory(servatrice) set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index c8f5ddabf..f5021db04 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -270,13 +270,6 @@ set(cockatrice_SOURCES src/interface/utility/sequence_edit.cpp ) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/deck_list ${CMAKE_BINARY_DIR}/libs/deck_list) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/rng ${CMAKE_BINARY_DIR}/libs/rng) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/utility ${CMAKE_BINARY_DIR}/libs/utility) add_subdirectory(sounds) add_subdirectory(themes) configure_file( @@ -369,9 +362,9 @@ elseif(Qt5_FOUND) endif() if(Qt5_FOUND) - target_link_libraries(cockatrice cardlib cockatrice_deck_list utility serverlib 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() - target_link_libraries(cockatrice PUBLIC cardlib cockatrice_deck_list utility serverlib 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() if(UNIX) diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt index 36d7c41f6..412a907b8 100644 --- a/dbconverter/CMakeLists.txt +++ b/dbconverter/CMakeLists.txt @@ -28,15 +28,15 @@ add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES}) # ------------------------ target_include_directories(dbconverter PRIVATE ../common # shared common headers - PRIVATE ../libs/card/include # cardlib public headers + PRIVATE ../libs/card/include # cockatrice_card public headers ) # ------------------------ # Link libraries # ------------------------ target_link_libraries(dbconverter - PRIVATE cardlib - PRIVATE settingslib + PRIVATE cockatrice_card + PRIVATE cockatrice_settings PRIVATE ${DB_CONVERTER_QT_MODULES} ) diff --git a/libs/card/CMakeLists.txt b/libs/card/CMakeLists.txt index 4e99c7fb6..66e08b015 100644 --- a/libs/card/CMakeLists.txt +++ b/libs/card/CMakeLists.txt @@ -30,7 +30,7 @@ elseif (Qt5_FOUND) qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) endif () -qt_add_library(cardlib STATIC +qt_add_library(cockatrice_card STATIC src/card_info.cpp src/card_info_comparator.cpp src/card_database/card_database.cpp @@ -54,14 +54,14 @@ qt_add_library(cardlib STATIC ${MOC_SOURCES} ) -target_include_directories(cardlib +target_include_directories(cockatrice_card PUBLIC include PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/libs/settings/include PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters ) -target_link_libraries(cardlib - PUBLIC settingslib +target_link_libraries(cockatrice_card + PUBLIC cockatrice_settings PUBLIC ${COCKATRICE_QT_MODULES} ) diff --git a/libs/server/CMakeLists.txt b/libs/server/CMakeLists.txt index 95efaeeb0..7ab0b19b2 100644 --- a/libs/server/CMakeLists.txt +++ b/libs/server/CMakeLists.txt @@ -30,7 +30,7 @@ elseif (Qt5_FOUND) qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) endif () -add_library(serverlib STATIC +add_library(cockatrice_server STATIC src/game/server_abstract_participant.cpp src/game/server_arrow.cpp src/game/server_arrowtarget.cpp @@ -53,7 +53,7 @@ add_library(serverlib STATIC ${MOC_SOURCES} ) -target_include_directories(serverlib +target_include_directories(cockatrice_server PUBLIC include PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb @@ -61,7 +61,7 @@ target_include_directories(serverlib PUBLIC ${CMAKE_BINARY_DIR}/libs/pb ) -# Make serverlib depend on cockatrice_protocol -target_link_libraries(serverlib +# Make cockatrice_server depend on cockatrice_protocol +target_link_libraries(cockatrice_server PUBLIC cockatrice_common cockatrice_protocol utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES} ) \ No newline at end of file diff --git a/libs/settings/CMakeLists.txt b/libs/settings/CMakeLists.txt index 08f9ba07e..f810de9d5 100644 --- a/libs/settings/CMakeLists.txt +++ b/libs/settings/CMakeLists.txt @@ -25,7 +25,7 @@ elseif (Qt5_FOUND) qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) endif () -add_library(settingslib STATIC +add_library(cockatrice_settings STATIC src/cache_settings.cpp src/card_counter_settings.cpp src/card_database_settings.cpp @@ -43,13 +43,13 @@ add_library(settingslib STATIC ${MOC_SOURCES} ) -target_include_directories(settingslib +target_include_directories(cockatrice_settings PUBLIC include PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network ) -target_link_libraries(settingslib +target_link_libraries(cockatrice_settings PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES} ) diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 201aedcfc..8edbd9eca 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -104,8 +104,8 @@ endif() # Link libraries # ------------------------ target_link_libraries(oracle - PRIVATE cardlib - PRIVATE settingslib + PRIVATE cockatrice_card + PRIVATE cockatrice_settings PRIVATE ${ORACLE_QT_MODULES} ) diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 2b345362a..99dc053b0 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -106,9 +106,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES}) if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") - target_link_libraries(servatrice cockatrice_common 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() - target_link_libraries(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES}) + target_link_libraries(servatrice cockatrice_common cockatrice_deck_list cockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES}) endif() # install rules diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index 48a0de004..3bde5c04b 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -1,6 +1,6 @@ #include "servatrice_database_interface.h" -#include "../../libs/utility/passwordhasher.h" +#include "utility/passwordhasher.h" #include "deck_list/deck_list.h" #include "pb/game_replay.pb.h" #include "servatrice.h" diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 4046d33ef..596025d7b 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -27,8 +27,8 @@ add_executable(carddatabase_test ) target_link_libraries(carddatabase_test - PRIVATE cardlib - PRIVATE settingslib + PRIVATE cockatrice_card + PRIVATE cockatrice_settings PRIVATE cockatrice_common PRIVATE Threads::Threads PRIVATE ${GTEST_BOTH_LIBRARIES} @@ -51,8 +51,8 @@ add_executable(filter_string_test ) target_link_libraries(filter_string_test - PRIVATE cardlib - PRIVATE settingslib + PRIVATE cockatrice_card + PRIVATE cockatrice_settings PRIVATE cockatrice_common PRIVATE Threads::Threads PRIVATE ${GTEST_BOTH_LIBRARIES} diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt index cbf30cbe9..2f684c9b7 100644 --- a/tests/loading_from_clipboard/CMakeLists.txt +++ b/tests/loading_from_clipboard/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") add_executable( - loading_from_clipboard_test deck_list/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp + loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp ) if(NOT GTEST_FOUND) @@ -12,6 +12,6 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE ) target_link_libraries( - loading_from_clipboard_test cockatrice_common 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)