Skip to content

Commit 930b98e

Browse files
committed
Fix cmake project import tests
1 parent 7aa0720 commit 930b98e

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ endif()
8181

8282

8383
if (BENCODE_ENABLE_INSTALL)
84+
set(bencode_package_name ${PROJECT_NAME})
8485
set(bencode_cmake_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/bencode)
8586
set(bencode_version_config ${PROJECT_BINARY_DIR}/bencode-config-version.cmake)
8687
set(bencode_project_config ${PROJECT_BINARY_DIR}/bencode-config.cmake)

cmake/bencode-config.cmake.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ find_dependency(fmt REQUIRED)
66
find_dependency(gsl-lite REQUIRED)
77
find_dependency(expected-lite REQUIRED)
88

9-
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
10-
check_required_components(bencode)
9+
if (NOT TARGET @bencode_package_name@::@bencode_package_name@)
10+
include("${CMAKE_CURRENT_LIST_DIR}/@bencode_targets_file@")
11+
check_required_components(bencode)
12+
endif()

external/expected-lite.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ else()
77
message(STATUS "Fetching dependency expected-lite...")
88
FetchContent_Declare(
99
expected-lite
10-
GIT_REPOSITORY https://github.com/martinmoene/expected-lite.git
10+
GIT_REPOSITORY https://github.com/fbdtemme/expected-lite.git
1111
GIT_TAG master
1212
)
1313
FetchContent_MakeAvailable(expected-lite)

tests/cmake_import/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ add_test(NAME cmake_import_configure
44
-A "${CMAKE_GENERATOR_PLATFORM}"
55
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
66
-Dbencode_DIR=${PROJECT_BINARY_DIR}
7+
-Dgsl-lite_DIR=${gsl-lite_BINARY_DIR}
8+
-Dexpected-lite_DIR=${expected-lite_BINARY_DIR}
9+
-Dfmt_DIR=${fmt_BINARY_DIR}
710
${CMAKE_CURRENT_SOURCE_DIR}/project
811
)
912
add_test(NAME cmake_import_build

0 commit comments

Comments
 (0)