Finally, CMake linting.

Took 11 minutes

Took 4 minutes
This commit is contained in:
Lukas Brübach 2025-10-05 00:29:52 +02:00
parent ecfcc078c4
commit 33cd0098f8
16 changed files with 302 additions and 311 deletions

View file

@ -9,30 +9,23 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
# ------------------------
# Qt modules
# ------------------------
set(TEST_QT_MODULES
${COCKATRICE_QT_VERSION_NAME}::Concurrent
${COCKATRICE_QT_VERSION_NAME}::Network
${COCKATRICE_QT_VERSION_NAME}::Widgets
${COCKATRICE_QT_VERSION_NAME}::Svg
set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg
)
# ------------------------
# Card Database Test
# ------------------------
add_executable(carddatabase_test
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
carddatabase_test.cpp
mocks.cpp
)
add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddatabase_test.cpp mocks.cpp)
target_link_libraries(carddatabase_test
PRIVATE cockatrice_card
PRIVATE cockatrice_settings
PRIVATE cockatrice_common
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
target_link_libraries(
carddatabase_test
PRIVATE cockatrice_card
PRIVATE cockatrice_settings
PRIVATE cockatrice_common
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
)
add_test(NAME carddatabase_test COMMAND carddatabase_test)
@ -40,23 +33,25 @@ add_test(NAME carddatabase_test COMMAND carddatabase_test)
# ------------------------
# Filter String Test
# ------------------------
add_executable(filter_string_test
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
../../cockatrice/src/filters/filter_card.cpp
../../cockatrice/src/filters/filter_string.cpp
../../cockatrice/src/filters/filter_tree.cpp
filter_string_test.cpp
mocks.cpp
add_executable(
filter_string_test
${MOCKS_SOURCES}
${VERSION_STRING_CPP}
../../cockatrice/src/filters/filter_card.cpp
../../cockatrice/src/filters/filter_string.cpp
../../cockatrice/src/filters/filter_tree.cpp
filter_string_test.cpp
mocks.cpp
)
target_link_libraries(filter_string_test
PRIVATE cockatrice_card
PRIVATE cockatrice_settings
PRIVATE cockatrice_common
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
target_link_libraries(
filter_string_test
PRIVATE cockatrice_card
PRIVATE cockatrice_settings
PRIVATE cockatrice_common
PRIVATE Threads::Threads
PRIVATE ${GTEST_BOTH_LIBRARIES}
PRIVATE ${TEST_QT_MODULES}
)
add_test(NAME filter_string_test COMMAND filter_string_test)

View file

@ -1,7 +1,5 @@
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
add_executable(
loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp
)
add_executable(loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp)
if(NOT GTEST_FOUND)
add_dependencies(loading_from_clipboard_test gtest)
@ -12,6 +10,7 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE
)
target_link_libraries(
loading_from_clipboard_test cockatrice_common cockatrice_deck_list 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)