Skip to content

Commit

Permalink
Address first round of feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
vyasr committed Nov 7, 2024
1 parent 08cb91b commit aaf4b7c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 $<BUILD_INTERFACE:cuda_std_17>)
Expand Down
6 changes: 5 additions & 1 deletion rapids_logger/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ function(rapids_make_logger logger_namespace)
${_RAPIDS_LOGGER_TARGET}
INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}>"
"$<INSTALL_INTERFACE:${_RAPIDS_LOGGER_HEADER_DIR}>")
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")
Expand Down Expand Up @@ -198,7 +199,10 @@ function(rapids_make_logger logger_namespace)
${impl_target}
INTERFACE $<BUILD_INTERFACE:${LOGGER_IMPL_SRC_OUTPUT_FILE}>
$<INSTALL_INTERFACE:${_RAPIDS_LOGGER_HEADER_DIR}/logger_impl/logger.cpp>)
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()

Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit aaf4b7c

Please sign in to comment.