Improve rapidcheck in cmake

TileDB-Inc · Jan 7, 2025 · 8ea9d7a · 8ea9d7a
1 parent d823062
commit 8ea9d7a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -447,6 +447,7 @@ target_include_directories(local_install INTERFACE ${CMAKE_SOURCE_DIR})
 enable_testing()
 
 if(TILEDB_TESTS)
+  find_package(rapidcheck CONFIG REQUIRED)
   # Add custom Catch2 entry point that suppresses message boxes on debug assertion
   # failures on Windows CI.
   find_package(Catch2 REQUIRED)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -212,12 +212,6 @@ if (NOT MSVC)
   add_compile_options(-Wno-deprecated-declarations)
 endif()
 
-find_library(
-  LIBRAPIDCHECK
-  NAMES rapidcheck
-  REQUIRED
-)
-
 # unit test executable
 add_executable(
   tiledb_unit EXCLUDE_FROM_ALL
@@ -241,7 +235,7 @@ target_link_libraries(tiledb_unit
     Catch2::Catch2
     tiledb_test_support_lib
     configuration_definitions
-    ${LIBRAPIDCHECK}
+    rapidcheck
 )
 
 target_link_libraries(tiledb_unit PRIVATE $<BUILD_INTERFACE:common>)

diff --git a/tiledb/common/algorithm/test/CMakeLists.txt b/tiledb/common/algorithm/test/CMakeLists.txt
@@ -26,15 +26,9 @@
 
 include(unit_test)
 
-find_library(
-  LIBRAPIDCHECK
-  NAMES rapidcheck
-  REQUIRED
-)
-
 commence(unit_test algorithm)
     this_target_object_libraries(algorithm)
     this_target_sources(main.cc unit_parallel_merge.cc)
     this_target_link_libraries(tiledb_test_support_lib)
-    this_target_link_libraries(${LIBRAPIDCHECK})
+    this_target_link_libraries(rapidcheck)
 conclude(unit_test)