Add cmake format (#4618)

* Support CMakeify operation * Run Cmakeify * Update cmakeify.sh Co-authored-by: ebbit1q <ebbit1q@gmail.com>
2026-06-12 09:04:53 -07:00 · 2022-05-08 15:22:43 -04:00 · 2022-05-08 15:22:43 -04:00 · a95b338c80
commit a95b338c80
parent 3e90f109a2
20 changed files with 1132 additions and 815 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -15,33 +15,31 @@ add_executable(password_hash_test password_hash_test.cpp)
 find_package(GTest)

 if(NOT GTEST_FOUND)
-    IF(NOT EXISTS "${CMAKE_BINARY_DIR}/gtest-build")
-        message(STATUS "Downloading googletest")
-        configure_file("${CMAKE_SOURCE_DIR}/cmake/gtest-CMakeLists.txt.in" "${CMAKE_BINARY_DIR}/gtest-download/CMakeLists.txt")
-        execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gtest-download )
-        execute_process(COMMAND ${CMAKE_COMMAND} --build .
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gtest-download )
-    ELSE()
-        message(STATUS "GoogleTest directory exists")
-    ENDIF()
+  if(NOT EXISTS "${CMAKE_BINARY_DIR}/gtest-build")
+    message(STATUS "Downloading googletest")
+    configure_file(
+      "${CMAKE_SOURCE_DIR}/cmake/gtest-CMakeLists.txt.in" "${CMAKE_BINARY_DIR}/gtest-download/CMakeLists.txt"
+    )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gtest-download
+    )
+    execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gtest-download)
+  else()
+    message(STATUS "GoogleTest directory exists")
+  endif()

-    # Add gtest directly to our build
-    add_subdirectory(${CMAKE_BINARY_DIR}/gtest-src
-            ${CMAKE_BINARY_DIR}/gtest-build
-            EXCLUDE_FROM_ALL )
+  # Add gtest directly to our build
+  add_subdirectory(${CMAKE_BINARY_DIR}/gtest-src ${CMAKE_BINARY_DIR}/gtest-build EXCLUDE_FROM_ALL)

-    # Add the gtest include directory, since gtest
-    # doesn't add that dependency to its gtest target
-    target_include_directories(gtest INTERFACE
-            "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/gtest-src/include>" )
+  # Add the gtest include directory, since gtest doesn't add that dependency to its gtest target
+  target_include_directories(gtest INTERFACE "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/gtest-src/include>")

-    SET(GTEST_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/gtest-src/include")
-    SET(GTEST_BOTH_LIBRARIES gtest)
-    add_dependencies(dummy_test gtest)
-    add_dependencies(expression_test gtest)
-    add_dependencies(test_age_formatting gtest)
-    add_dependencies(password_hash_test gtest)
+  set(GTEST_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/gtest-src/include")
+  set(GTEST_BOTH_LIBRARIES gtest)
+  add_dependencies(dummy_test gtest)
+  add_dependencies(expression_test gtest)
+  add_dependencies(test_age_formatting gtest)
+  add_dependencies(password_hash_test gtest)
 endif()

 include_directories(${GTEST_INCLUDE_DIRS})
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@ -1,52 +1,49 @@
-ADD_DEFINITIONS("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
+add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")

-SET(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg)
-
-IF(Qt6_FOUND)
-    QT6_WRAP_CPP(MOCKS_SOURCES
-        ../../cockatrice/src/settingscache.h
-        ../../cockatrice/src/settings/carddatabasesettings.h
-    )
-ELSEIF(Qt5_FOUND)
-    QT5_WRAP_CPP(MOCKS_SOURCES
-        ../../cockatrice/src/settingscache.h
-        ../../cockatrice/src/settings/carddatabasesettings.h
-    )
-ENDIF()
-
-add_executable(carddatabase_test
-    carddatabase_test.cpp
-    mocks.cpp
-    ../../cockatrice/src/carddatabase.cpp
-    ../../cockatrice/src/carddbparser/carddatabaseparser.cpp
-    ../../cockatrice/src/carddbparser/cockatricexml3.cpp
-    ../../cockatrice/src/carddbparser/cockatricexml4.cpp
-    ../../cockatrice/src/settings/settingsmanager.cpp
-    ${VERSION_STRING_CPP}
-    ${MOCKS_SOURCES}
+set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
+                    ${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg
 )
-add_executable(filter_string_test
-    filter_string_test.cpp
-    mocks.cpp
-    ../../cockatrice/src/filter_string.cpp
-    ../../cockatrice/src/cardfilter.cpp
-    ../../cockatrice/src/filtertree.cpp
-    ../../cockatrice/src/carddatabase.cpp
-    ../../cockatrice/src/carddbparser/carddatabaseparser.cpp
-    ../../cockatrice/src/carddbparser/cockatricexml3.cpp
-    ../../cockatrice/src/carddbparser/cockatricexml4.cpp
-    ../../cockatrice/src/settings/settingsmanager.cpp
-    ${VERSION_STRING_CPP}
-    ${MOCKS_SOURCES}
+
+if(Qt6_FOUND)
+  qt6_wrap_cpp(MOCKS_SOURCES ../../cockatrice/src/settingscache.h ../../cockatrice/src/settings/carddatabasesettings.h)
+elseif(Qt5_FOUND)
+  qt5_wrap_cpp(MOCKS_SOURCES ../../cockatrice/src/settingscache.h ../../cockatrice/src/settings/carddatabasesettings.h)
+endif()
+
+add_executable(
+  carddatabase_test
+  ${MOCKS_SOURCES}
+  ${VERSION_STRING_CPP}
+  ../../cockatrice/src/carddatabase.cpp
+  ../../cockatrice/src/carddbparser/carddatabaseparser.cpp
+  ../../cockatrice/src/carddbparser/cockatricexml3.cpp
+  ../../cockatrice/src/carddbparser/cockatricexml4.cpp
+  ../../cockatrice/src/settings/settingsmanager.cpp
+  carddatabase_test.cpp
+  mocks.cpp
+)
+add_executable(
+  filter_string_test
+  ${MOCKS_SOURCES}
+  ${VERSION_STRING_CPP}
+  ../../cockatrice/src/carddatabase.cpp
+  ../../cockatrice/src/carddbparser/carddatabaseparser.cpp
+  ../../cockatrice/src/carddbparser/cockatricexml3.cpp
+  ../../cockatrice/src/carddbparser/cockatricexml4.cpp
+  ../../cockatrice/src/cardfilter.cpp
+  ../../cockatrice/src/filter_string.cpp
+  ../../cockatrice/src/filtertree.cpp
+  ../../cockatrice/src/settings/settingsmanager.cpp
+  filter_string_test.cpp
+  mocks.cpp
 )
 if(NOT GTEST_FOUND)
-    add_dependencies(carddatabase_test gtest)
-    add_dependencies(filter_string_test gtest)
+  add_dependencies(carddatabase_test gtest)
+  add_dependencies(filter_string_test gtest)
 endif()

 target_link_libraries(carddatabase_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 target_link_libraries(filter_string_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})

-
 add_test(NAME carddatabase_test COMMAND carddatabase_test)
 add_test(NAME filter_string_test COMMAND filter_string_test)
--- a/tests/loading_from_clipboard/CMakeLists.txt
+++ b/tests/loading_from_clipboard/CMakeLists.txt
@ -1,15 +1,17 @@
-ADD_DEFINITIONS("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
-add_executable(loading_from_clipboard_test
-        loading_from_clipboard_test.cpp
-        clipboard_testing.cpp
-        ../../common/decklist.cpp
-        )
+add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
+add_executable(
+  loading_from_clipboard_test ../../common/decklist.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp
+)

 if(NOT GTEST_FOUND)
-    add_dependencies(loading_from_clipboard_test gtest)
+  add_dependencies(loading_from_clipboard_test gtest)
 endif()

-SET(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::Widgets)
+set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
+                    ${COCKATRICE_QT_VERSION_NAME}::Widgets
+)

-target_link_libraries(loading_from_clipboard_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(
+  loading_from_clipboard_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
 add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test)