diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f7d342aa..5db556585 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,6 @@ endif() target_link_libraries(rmm INTERFACE rmm_logger) target_link_libraries(rmm INTERFACE CCCL::CCCL) target_link_libraries(rmm INTERFACE fmt::fmt-header-only) -target_link_libraries(rmm INTERFACE spdlog::spdlog_header_only) target_link_libraries(rmm INTERFACE dl) target_link_libraries(rmm INTERFACE nvtx3::nvtx3-cpp) target_compile_features(rmm INTERFACE cxx_std_17 $) diff --git a/rapids_logger/CMakeLists.txt b/rapids_logger/CMakeLists.txt index e436b03e7..781e7e874 100644 --- a/rapids_logger/CMakeLists.txt +++ b/rapids_logger/CMakeLists.txt @@ -168,6 +168,7 @@ function(rapids_make_logger logger_namespace) ${_RAPIDS_LOGGER_TARGET} INTERFACE "$" "$") + target_compile_features(${_RAPIDS_LOGGER_TARGET} INTERFACE cxx_std_17) if(_RAPIDS_RMM_BACKWARDS_COMPATIBILITY) if(NOT _RAPIDS_SUPPORTS_LOGGING) message(STATUS "RMM_BACKWARDS_COMPATIBILITY requires SUPPORTS_LOGGING, turning it on") @@ -198,7 +199,10 @@ function(rapids_make_logger logger_namespace) ${impl_target} INTERFACE $ $) - target_link_libraries(${impl_target} INTERFACE ${_RAPIDS_LOGGER_TARGET}) + target_link_libraries(${impl_target} INTERFACE ${_RAPIDS_LOGGER_TARGET} + spdlog::spdlog_header_only) + else() + target_link_libraries(${_RAPIDS_LOGGER_TARGET} INTERFACE spdlog::spdlog_header_only) endif() endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c0009c013..90d912be6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -46,7 +46,7 @@ function(ConfigureTestInternal TEST_NAME) # When not building in compatibility mode, each test has to recompile the headers. if(TARGET rmm_test_logger) - target_link_libraries(${TEST_NAME} rmm_test_logger) + target_link_libraries(${TEST_NAME} PRIVATE rmm_test_logger) endif() if(DISABLE_DEPRECATION_WARNING)