diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6a690ba25..7893cea32 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -279,9 +279,9 @@ if(CMAKE_BUILD_TYPE STREQUAL Coverage) 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 @@ -289,7 +289,7 @@ 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 + # some other setup that isn't that important to run on all OS set(package_test_command) endif() @@ -304,23 +304,23 @@ if(CLI11_INSTALL_PACKAGE_TESTS) 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}" + 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" + "-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" + 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() @@ -338,29 +338,24 @@ if(CLI11_INSTALL_PACKAGE_TESTS) 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) - 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-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()