style: pre-commit.ci fixes

CLIUtils · Aug 15, 2023 · c3cec5f · c3cec5f
1 parent 80356ae
commit c3cec5f
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 80 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -278,97 +278,90 @@ if(CMAKE_BUILD_TYPE STREQUAL Coverage)
     ${CLI11_MULTIONLY_TESTS})
 endif()
 
-
 if(CLI11_INSTALL_PACKAGE_TESTS)
-    set(CLI11_PACKAGE_SEARCH_LOC)
+  set(CLI11_PACKAGE_SEARCH_LOC)
 else()
-    set(CLI11_PACKAGE_SEARCH_LOC "-DCLI11_DIR=${PROJECT_BINARY_DIR}")
+  set(CLI11_PACKAGE_SEARCH_LOC "-DCLI11_DIR=${PROJECT_BINARY_DIR}")
 endif()
 
 # tests of the cmake package and pkg-config package
-if (CLI11_INSTALL_PACKAGE_TESTS)
-if(NOT MSVC)
+if(CLI11_INSTALL_PACKAGE_TESTS)
+  if(NOT MSVC)
     set(package_test_command --test-command "${CMAKE_CTEST_COMMAND}")
-else() # don't try to run the tests on MSVC since that would require copying the dll's and doing
-       # some other setup that isn't that important to run on all OS
+  else() # don't try to run the tests on MSVC since that would require copying the dll's and doing
+         # some other setup that isn't that important to run on all OS
     set(package_test_command)
-endif()
+  endif()
 
-if(CMAKE_BUILD_TYPE)
+  if(CMAKE_BUILD_TYPE)
     set(CLI11_PACKAGE_TEST_BUILD_TYPE ${CMAKE_BUILD_TYPE})
-else()
+  else()
     set(CLI11_PACKAGE_TEST_BUILD_TYPE Release)
-endif()
+  endif()
 
-file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests")
+  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests")
 
-if(MSVC AND ${CMAKE_VERSION} VERSION_GREATER 3.12.9)
+  if(MSVC AND ${CMAKE_VERSION} VERSION_GREATER 3.12.9)
     # Tests for other CMake projects including and using CLI11 using find_package
     add_test(
-        NAME find-package-testsA
-        COMMAND
-            ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -A "${CMAKE_GENERATOR_PLATFORM}"
-            ${CLI11_PACKAGE_SEARCH_LOC}
-            "-DCLI11_VERSION=${CLI11_VERSION}" "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-            "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
-            "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/find_package_tests"
-        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests"
-    )
-else()
+      NAME find-package-testsA
+      COMMAND
+        ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -A "${CMAKE_GENERATOR_PLATFORM}"
+        ${CLI11_PACKAGE_SEARCH_LOC} "-DCLI11_VERSION=${CLI11_VERSION}"
+        "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
+        "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/find_package_tests"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests")
+  else()
     add_test(
-        NAME find-package-testsA
-        COMMAND
-            ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${CLI11_PACKAGE_SEARCH_LOC}
-            "-DCLI11_VERSION=${CLI11_VERSION}" "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-            "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
-            "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/find_package_tests"
-        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests"
-    )
-endif()
+      NAME find-package-testsA
+      COMMAND
+        ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${CLI11_PACKAGE_SEARCH_LOC}
+        "-DCLI11_VERSION=${CLI11_VERSION}" "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+        "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
+        "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/find_package_tests"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests")
+  endif()
 
-add_test(NAME find-package-testsB
-         COMMAND ${CMAKE_COMMAND} --build "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests" --config
-                 ${CLI11_PACKAGE_TEST_BUILD_TYPE}
-)
-
-add_test(NAME find-package-testsC COMMAND ${CMAKE_CTEST_COMMAND} -C
-                                          ${CLI11_PACKAGE_TEST_BUILD_TYPE}
-         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests"
-)
-set_property(TEST find-package-testsA PROPERTY LABELS Packaging PackagingFast)
-set_property(TEST find-package-testsB PROPERTY LABELS Packaging PackagingFast)
-set_property(TEST find-package-testsB PROPERTY DEPENDS find-package-testsA)
-set_property(TEST find-package-testsC PROPERTY LABELS Packaging PackagingFast)
-set_property(TEST find-package-testsC PROPERTY DEPENDS find-package-testsB)
-
-cmake_dependent_advanced_option(
+  add_test(NAME find-package-testsB
+           COMMAND ${CMAKE_COMMAND} --build "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests"
+                   --config ${CLI11_PACKAGE_TEST_BUILD_TYPE})
+
+  add_test(
+    NAME find-package-testsC
+    COMMAND ${CMAKE_CTEST_COMMAND} -C ${CLI11_PACKAGE_TEST_BUILD_TYPE}
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/find_package_tests")
+  set_property(TEST find-package-testsA PROPERTY LABELS Packaging PackagingFast)
+  set_property(TEST find-package-testsB PROPERTY LABELS Packaging PackagingFast)
+  set_property(TEST find-package-testsB PROPERTY DEPENDS find-package-testsA)
+  set_property(TEST find-package-testsC PROPERTY LABELS Packaging PackagingFast)
+  set_property(TEST find-package-testsC PROPERTY DEPENDS find-package-testsB)
+
+  cmake_dependent_advanced_option(
     CLI11_ENABLE_SUBPROJECT_TESTS
     "Enable tests of using CLI11 as a subproject, potentially a slow tests" OFF
-    "CLI11_BUILD_TESTS" OFF
-)
+    "CLI11_BUILD_TESTS" OFF)
 
-if(NOT MSVC)
+  if(NOT MSVC)
     # Tests for other CMake projects using the package_config files
     add_test(
-        package-config-tests
-        ${CMAKE_CTEST_COMMAND}
-        -C
-        ${CLI11_PACKAGE_TEST_BUILD_TYPE}
-        --build-and-test
-        "${CMAKE_CURRENT_SOURCE_DIR}/package_config_tests"
-        "${CMAKE_CURRENT_BINARY_DIR}/package_config_tests"
-        --build-generator
-        "${CMAKE_GENERATOR}"
-        --build-generator-platform
-        "${CMAKE_GENERATOR_PLATFORM}"
-        --build-options
-        "-DCLI11_VERSION=${CLI11_VERSION}"
-        "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-        "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
-        ${package_test_command}
-    )
+      package-config-tests
+      ${CMAKE_CTEST_COMMAND}
+      -C
+      ${CLI11_PACKAGE_TEST_BUILD_TYPE}
+      --build-and-test
+      "${CMAKE_CURRENT_SOURCE_DIR}/package_config_tests"
+      "${CMAKE_CURRENT_BINARY_DIR}/package_config_tests"
+      --build-generator
+      "${CMAKE_GENERATOR}"
+      --build-generator-platform
+      "${CMAKE_GENERATOR_PLATFORM}"
+      --build-options
+      "-DCLI11_VERSION=${CLI11_VERSION}"
+      "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+      "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
+      ${package_test_command})
     set_property(TEST package-config-tests PROPERTY LABELS Packaging)
-endif()
+  endif()
 endif()
diff --git a/tests/find_package_tests/CMakeLists.txt b/tests/find_package_tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 cmake_minimum_required(VERSION 3.10...3.26)
 
 project(CLI11-find-package-test)
@@ -9,8 +8,8 @@ include(CTest)
 find_package(CLI11 2.0 REQUIRED)
 
 # Test the target
-    add_executable(package-test ../../examples/positional_validation.cpp)
-    target_link_libraries(package-test CLI11::CLI11)
+add_executable(package-test ../../examples/positional_validation.cpp)
+target_link_libraries(package-test CLI11::CLI11)
 
-    add_test(NAME package-test1 COMMAND package-test one)
-    set_property(TEST package-test1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")
+add_test(NAME package-test1 COMMAND package-test one)
+set_property(TEST package-test1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")
diff --git a/tests/package_config_tests/CMakeLists.txt b/tests/package_config_tests/CMakeLists.txt
@@ -12,8 +12,8 @@ find_package(PkgConfig)
 pkg_check_modules(CLI11 REQUIRED IMPORTED_TARGET cli11)
 
 # Test the target
-    add_executable(package-config-test ../../examples/positional_validation.cpp)
-    target_link_libraries(package-config-test PkgConfig::CLI11)
+add_executable(package-config-test ../../examples/positional_validation.cpp)
+target_link_libraries(package-config-test PkgConfig::CLI11)
 
-    add_test(NAME package-config-test1 COMMAND package-config-test one)
-    set_property(TEST package-config-test1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")
+add_test(NAME package-config-test1 COMMAND package-config-test one)
+set_property(TEST package-config-test1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")