Page MenuHomePhabricator
Files F13115592

D5452.diff
No OneTemporary
Actions

D5452.diff
View Options

diff --git a/cmake/modules/FindRapidcheck.cmake b/cmake/modules/FindRapidcheck.cmake
--- a/cmake/modules/FindRapidcheck.cmake
+++ b/cmake/modules/FindRapidcheck.cmake
@@ -6,7 +6,9 @@
# FindRapidcheck
# --------------
#
-# Find the Rapidcheck library.
+# Find the Rapidcheck library. The following conponents are
+# available::
+# rapidcheck
#
# This will define the following variables::
#
@@ -16,49 +18,30 @@
#
# And the following imported targets::
#
-# Rapidcheck::Rapidcheck
+# Rapidcheck::rapidcheck
find_path(Rapidcheck_INCLUDE_DIR
NAMES rapidcheck.h
PATH_SUFFIXES rapidcheck
)
-find_library(Rapidcheck_LIBRARY
- NAMES rapidcheck
- PATH_SUFFIXES rapidcheck
-)
+set(Rapidcheck_INCLUDE_DIRS "${Rapidcheck_INCLUDE_DIR}")
+mark_as_advanced(Rapidcheck_INCLUDE_DIR)
# TODO: extract a version number.
# For now rapidcheck does not provide such a version number, and has no release.
# See https://github.com/emil-e/rapidcheck/issues/235 for reference.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Rapidcheck
- DEFAULT_MSG
- Rapidcheck_INCLUDE_DIR
- Rapidcheck_LIBRARY
+include(ExternalLibraryHelper)
+find_component(Rapidcheck rapidcheck
+ NAMES rapidcheck
+ PATH_SUFFIXES rapidcheck
+ INCLUDE_DIRS ${Rapidcheck_INCLUDE_DIRS}
)
-if(Rapidcheck_FOUND)
- set(Rapidcheck_INCLUDE_DIRS "${Rapidcheck_INCLUDE_DIR}")
- set(Rapidcheck_LIBRARIES "${Rapidcheck_LIBRARY}")
-
- include(FindPackageMessage)
- find_package_message(Rapidcheck
- "Found Rapidcheck: ${Rapidcheck_LIBRARIES}"
- "[${Rapidcheck_LIBRARIES}][${Rapidcheck_INCLUDE_DIRS}]"
- )
-
- if(NOT TARGET Rapidcheck::Rapidcheck)
- add_library(Rapidcheck::Rapidcheck UNKNOWN IMPORTED)
- set_target_properties(Rapidcheck::Rapidcheck PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Rapidcheck_INCLUDE_DIR}"
- IMPORTED_LOCATION "${Rapidcheck_LIBRARY}"
- )
- endif()
-endif()
-
-mark_as_advanced(
- Rapidcheck_INCLUDE_DIR
- Rapidcheck_LIBRARY
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Rapidcheck
+ REQUIRED_VARS
+ Rapidcheck_INCLUDE_DIR
+ HANDLE_COMPONENTS
)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -200,7 +200,7 @@
)
if(ENABLE_PROPERTY_BASED_TESTS)
- target_link_libraries(test_bitcoin Rapidcheck::Rapidcheck)
+ target_link_libraries(test_bitcoin Rapidcheck::rapidcheck)
endif()
function(add_boost_test_runners_with_upgrade_activated SUITE EXECUTABLE)

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:29 (8 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187614
Default Alt Text
D5452.diff (2 KB)

Event Timeline