Fix USE_RMM define setup

valgur · Aug 30, 2023 · 447bcda · 447bcda
1 parent d4b61a6
commit 447bcda
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git 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
-    $<$<BOOL:USE_RMM>:USE_RMM>
 )
 
 if (TARGET cupoch::utility)

diff --git 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
@@ -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
@@ -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}/