Skip to content

Commit f88fa6e

Browse files
committed
update the package_config_tests
1 parent f9a2158 commit f88fa6e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tests/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ if(CLI11_INSTALL_PACKAGE_TESTS)
339339
package-config-tests
340340
${CMAKE_CTEST_COMMAND}
341341
-C
342-
${CLI11_PACKAGE_TEST_BUILD_TYPE}
342+
"-DCLI11_DIR=${CMAKE_INSTALL_PREFIX}"
343343
--build-and-test
344344
"${CMAKE_CURRENT_SOURCE_DIR}/package_config_tests"
345345
"${CMAKE_CURRENT_BINARY_DIR}/package_config_tests"
@@ -348,7 +348,6 @@ if(CLI11_INSTALL_PACKAGE_TESTS)
348348
--build-generator-platform
349349
"${CMAKE_GENERATOR_PLATFORM}"
350350
--build-options
351-
"-DCLI11_VERSION=${CLI11_VERSION}"
352351
"-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
353352
"-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
354353
${package_test_command})

tests/package_config_tests/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ project(CLI11-package-config-test)
44

55
include(CTest)
66

7-
# Test the CLI11 CMake package config
8-
find_package(CLI11 2.0 REQUIRED)
9-
107
find_package(PkgConfig)
118

12-
pkg_check_modules(CLI11 REQUIRED IMPORTED_TARGET cli11)
9+
if(CLI11_DIR)
10+
set(CMAKE_PREFIX_PATH ${CLI11_DIR})
11+
endif()
12+
13+
pkg_check_modules(CLI11 REQUIRED IMPORTED_TARGET CLI11)
1314

1415
# Test the target
1516
add_executable(package-config-test ../../examples/positional_validation.cpp)

0 commit comments

Comments
 (0)