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

Properly name lib targets.

Browse source 
Took 24 minutes
This commit is contained in:
Lukas Brübach 2025-10-04 20:30:51 +02:00
parent 408b732854
commit 2ce855cb17
11 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -327,6 +327,13 @@ endif()
include(CPack) include(CPack)
add_subdirectory(common) 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) if(WITH_SERVER)
add_subdirectory(servatrice) add_subdirectory(servatrice)
set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})

11
cockatrice/CMakeLists.txt
View file

@ -270,13 +270,6 @@ set(cockatrice_SOURCES
src/interface/utility/sequence_edit.cpp 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(sounds)
add_subdirectory(themes) add_subdirectory(themes)
configure_file( configure_file(
@ -369,9 +362,9 @@ elseif(Qt5_FOUND)
endif() endif()
if(Qt5_FOUND) 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() 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() endif()
if(UNIX) if(UNIX)

6
dbconverter/CMakeLists.txt
View file

@ -28,15 +28,15 @@ add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
# ------------------------ # ------------------------
target_include_directories(dbconverter target_include_directories(dbconverter
PRIVATE ../common # shared common headers PRIVATE ../common # shared common headers
PRIVATE ../libs/card/include # cardlib public headers PRIVATE ../libs/card/include # cockatrice_card public headers
) )
# ------------------------ # ------------------------
# Link libraries # Link libraries
# ------------------------ # ------------------------
target_link_libraries(dbconverter target_link_libraries(dbconverter
PRIVATE cardlib PRIVATE cockatrice_card
PRIVATE settingslib PRIVATE cockatrice_settings
PRIVATE ${DB_CONVERTER_QT_MODULES} PRIVATE ${DB_CONVERTER_QT_MODULES}
) )

8
libs/card/CMakeLists.txt
View file

@ -30,7 +30,7 @@ elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif ()
qt_add_library(cardlib STATIC qt_add_library(cockatrice_card STATIC
src/card_info.cpp src/card_info.cpp
src/card_info_comparator.cpp src/card_info_comparator.cpp
src/card_database/card_database.cpp src/card_database/card_database.cpp
@ -54,14 +54,14 @@ qt_add_library(cardlib STATIC
${MOC_SOURCES} ${MOC_SOURCES}
) )
target_include_directories(cardlib target_include_directories(cockatrice_card
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/libs/settings/include PUBLIC ${CMAKE_SOURCE_DIR}/libs/settings/include
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
) )
target_link_libraries(cardlib target_link_libraries(cockatrice_card
PUBLIC settingslib PUBLIC cockatrice_settings
PUBLIC ${COCKATRICE_QT_MODULES} PUBLIC ${COCKATRICE_QT_MODULES}
) )

8
libs/server/CMakeLists.txt
View file

@ -30,7 +30,7 @@ elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif ()
add_library(serverlib STATIC add_library(cockatrice_server STATIC
src/game/server_abstract_participant.cpp src/game/server_abstract_participant.cpp
src/game/server_arrow.cpp src/game/server_arrow.cpp
src/game/server_arrowtarget.cpp src/game/server_arrowtarget.cpp
@ -53,7 +53,7 @@ add_library(serverlib STATIC
${MOC_SOURCES} ${MOC_SOURCES}
) )
target_include_directories(serverlib target_include_directories(cockatrice_server
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb
@ -61,7 +61,7 @@ target_include_directories(serverlib
PUBLIC ${CMAKE_BINARY_DIR}/libs/pb PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
) )
# Make serverlib depend on cockatrice_protocol # Make cockatrice_server depend on cockatrice_protocol
target_link_libraries(serverlib target_link_libraries(cockatrice_server
PUBLIC cockatrice_common cockatrice_protocol utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES} PUBLIC cockatrice_common cockatrice_protocol utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES}
) )

6
libs/settings/CMakeLists.txt
View file

@ -25,7 +25,7 @@ elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif ()
add_library(settingslib STATIC add_library(cockatrice_settings STATIC
src/cache_settings.cpp src/cache_settings.cpp
src/card_counter_settings.cpp src/card_counter_settings.cpp
src/card_database_settings.cpp src/card_database_settings.cpp
@ -43,13 +43,13 @@ add_library(settingslib STATIC
${MOC_SOURCES} ${MOC_SOURCES}
) )
target_include_directories(settingslib target_include_directories(cockatrice_settings
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
) )
target_link_libraries(settingslib target_link_libraries(cockatrice_settings
PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES} PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES}
) )

4
oracle/CMakeLists.txt
View file

@ -104,8 +104,8 @@ endif()
# Link libraries # Link libraries
# ------------------------ # ------------------------
target_link_libraries(oracle target_link_libraries(oracle
PRIVATE cardlib PRIVATE cockatrice_card
PRIVATE settingslib PRIVATE cockatrice_settings
PRIVATE ${ORACLE_QT_MODULES} PRIVATE ${ORACLE_QT_MODULES}
) )

4
servatrice/CMakeLists.txt
View file

@ -106,9 +106,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES}) add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES})
if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") 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() 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() endif()
# install rules # install rules

2
servatrice/src/servatrice_database_interface.cpp
View file

@ -1,6 +1,6 @@
#include "servatrice_database_interface.h" #include "servatrice_database_interface.h"
#include "../../libs/utility/passwordhasher.h" #include "utility/passwordhasher.h"
#include "deck_list/deck_list.h" #include "deck_list/deck_list.h"
#include "pb/game_replay.pb.h" #include "pb/game_replay.pb.h"
#include "servatrice.h" #include "servatrice.h"

8
tests/carddatabase/CMakeLists.txt
View file

@ -27,8 +27,8 @@ add_executable(carddatabase_test
) )
target_link_libraries(carddatabase_test target_link_libraries(carddatabase_test
PRIVATE cardlib PRIVATE cockatrice_card
PRIVATE settingslib PRIVATE cockatrice_settings
PRIVATE cockatrice_common PRIVATE cockatrice_common
PRIVATE Threads::Threads PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES} PRIVATE ${GTEST_BOTH_LIBRARIES}
@ -51,8 +51,8 @@ add_executable(filter_string_test
) )
target_link_libraries(filter_string_test target_link_libraries(filter_string_test
PRIVATE cardlib PRIVATE cockatrice_card
PRIVATE settingslib PRIVATE cockatrice_settings
PRIVATE cockatrice_common PRIVATE cockatrice_common
PRIVATE Threads::Threads PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES} PRIVATE ${GTEST_BOTH_LIBRARIES}

4
tests/loading_from_clipboard/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
add_executable( 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) if(NOT GTEST_FOUND)
@ -12,6 +12,6 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE
) )
target_link_libraries( 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) add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test)