FIX rpath of libcuvs targets

rapidsai · Mar 3, 2024 · 9824dff · 9824dff
1 parent 2581814
commit 9824dff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -280,11 +280,14 @@ endif()
 
 set_target_properties(
   cuvs
-  PROPERTIES CXX_STANDARD 17
-             CXX_STANDARD_REQUIRED ON
-             CUDA_STANDARD 17
-             CUDA_STANDARD_REQUIRED ON
-             POSITION_INDEPENDENT_CODE ON
+  PROPERTIES BUILD_RPATH                         "\$ORIGIN"
+             INSTALL_RPATH                       "\$ORIGIN"
+             CXX_STANDARD                        17
+             CXX_STANDARD_REQUIRED               ON
+             CUDA_STANDARD                       17
+             CUDA_STANDARD_REQUIRED              ON
+             INTERFACE_POSITION_INDEPENDENT_CODE ON
+             POSITION_INDEPENDENT_CODE           ON
 )
 
 target_compile_options(
@@ -303,10 +306,13 @@ if(BUILD_C_LIBRARY)
 
   set_target_properties(
     cuvs_c
-    PROPERTIES CXX_STANDARD 17
-               CXX_STANDARD_REQUIRED ON
-               POSITION_INDEPENDENT_CODE ON
-               EXPORT_NAME c_api
+    PROPERTIES BUILD_RPATH                         "\$ORIGIN"
+               INSTALL_RPATH                       "\$ORIGIN"
+               CXX_STANDARD                        17
+               CXX_STANDARD_REQUIRED               ON
+               POSITION_INDEPENDENT_CODE           ON
+               INTERFACE_POSITION_INDEPENDENT_CODE ON
+               EXPORT_NAME                         c_api
   )
 
   target_compile_options(cuvs_c PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CUVS_CXX_FLAGS}>")

diff --git a/python/cuvs/CMakeLists.txt b/python/cuvs/CMakeLists.txt
@@ -42,6 +42,7 @@ message("- FIND_CUVS_CPP: ${FIND_CUVS_CPP}")
 include(../../fetch_rapids.cmake)
 include(rapids-cmake)
 include(rapids-cpm)
+include(rapids-cython-core)
 include(rapids-export)
 include(rapids-find)
 
@@ -69,8 +70,6 @@ if(NOT cuvs_FOUND)
   install(TARGETS cuvs cuvs_c DESTINATION ${cython_lib_dir})
 endif()
 
-include(rapids-cython-core)
-
 rapids_cython_init()
 
 add_subdirectory(cuvs/common)