diff --git a/cmake/cupoch_cuda_flags.cmake b/cmake/cupoch_cuda_flags.cmake index 8a8e9477..9f9e2670 100644 --- a/cmake/cupoch_cuda_flags.cmake +++ b/cmake/cupoch_cuda_flags.cmake @@ -35,7 +35,6 @@ target_link_libraries(cupoch_flags INTERFACE ) target_compile_definitions(cupoch_flags INTERFACE THRUST_IGNORE_CUB_VERSION_CHECK - $<$:USE_RMM> ) if (TARGET cupoch::utility) diff --git a/conanfile.py b/conanfile.py index de2bf6e3..96189c04 100644 --- a/conanfile.py +++ b/conanfile.py @@ -262,6 +262,10 @@ def package_info(self): if self.options.get_safe("use_rmm"): self.cpp_info.components["utility"].requires.append("rmm::rmm") + self.cpp_info.components["utility"].defines.append("USE_RMM") + if "flann_cuda" in self.cpp_info.components: + self.cpp_info.components["flann_cuda"].requires.append("rmm::rmm") + self.cpp_info.components["flann_cuda"].defines.append("USE_RMM") # Propagate necessary build flags utility = self.cpp_info.components["utility"] diff --git a/src/cupoch/utility/CMakeLists.txt b/src/cupoch/utility/CMakeLists.txt index e37b100b..be95c1da 100644 --- a/src/cupoch/utility/CMakeLists.txt +++ b/src/cupoch/utility/CMakeLists.txt @@ -27,4 +27,5 @@ target_link_libraries(cupoch_utility if(USE_RMM) find_package(rmm REQUIRED CONFIG) target_link_libraries(cupoch_utility PUBLIC rmm::rmm) + target_compile_definitions(cupoch_utility PUBLIC USE_RMM) endif() diff --git a/third_party/flann_cuda-config.cmake b/third_party/flann_cuda-config.cmake index b4aeaaf8..d57e2f11 100644 --- a/third_party/flann_cuda-config.cmake +++ b/third_party/flann_cuda-config.cmake @@ -15,6 +15,7 @@ target_link_libraries(flann_cuda_s PRIVATE cupoch::flags CUDA::cudart spdlog::sp if(USE_RMM) find_package(rmm REQUIRED CONFIG) target_link_libraries(flann_cuda_s PRIVATE rmm::rmm) + target_compile_definitions(flann_cuda_s PUBLIC USE_RMM) endif() install(TARGETS flann_cuda_s) install(DIRECTORY ${flann_cuda_SOURCE_DIR}/