From b7180f3aea75c0a80f0b1ccf9767b0935df4c66b Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:17:27 +0200 Subject: [PATCH] Fix macos tests --- src/libhictk/balancing/CMakeLists.txt | 2 +- test/units/balancing/CMakeLists.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libhictk/balancing/CMakeLists.txt b/src/libhictk/balancing/CMakeLists.txt index fefed0f1..e6325e44 100644 --- a/src/libhictk/balancing/CMakeLists.txt +++ b/src/libhictk/balancing/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_system_libraries( bshoshany-thread-pool::bshoshany-thread-pool nonstd::span-lite phmap - xxHash::xxhash + xxHash::xxhash "zstd::libzstd_$,shared,static>") target_compile_definitions(balancing INTERFACE span_FEATURE_MAKE_SPAN=1) diff --git a/test/units/balancing/CMakeLists.txt b/test/units/balancing/CMakeLists.txt index 22804fdd..4d9f96c7 100644 --- a/test/units/balancing/CMakeLists.txt +++ b/test/units/balancing/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_system_libraries( Catch2::Catch2WithMain std::filesystem) -file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Testing/) +file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Testing/") # automatically discover tests that are defined in catch based test files you can modify the unittests. TEST_PREFIX to # whatever you want, or use different for different binaries @@ -33,9 +33,9 @@ catch_discover_tests( TEST_SUFFIX " - SHORT" WORKING_DIRECTORY - ${PROJECT_SOURCE_DIR} + "${PROJECT_SOURCE_DIR}" OUTPUT_DIR - ${CMAKE_CURRENT_SOURCE_DIR}/Testing/ + "${CMAKE_CURRENT_BINARY_DIR}/Testing/" EXTRA_ARGS --success --skip-benchmarks) @@ -47,7 +47,7 @@ catch_discover_tests( TEST_SUFFIX " - MEDIUM" WORKING_DIRECTORY - ${PROJECT_SOURCE_DIR} + "${PROJECT_SOURCE_DIR}" EXTRA_ARGS --success --skip-benchmarks) @@ -59,7 +59,7 @@ catch_discover_tests( TEST_SUFFIX " - LONG" WORKING_DIRECTORY - ${PROJECT_SOURCE_DIR} + "${PROJECT_SOURCE_DIR}" EXTRA_ARGS --success --skip-benchmarks)