From ff3fddfa1c6771e2b54b2abb7438811a774265a7 Mon Sep 17 00:00:00 2001
From: "Corey J. Nolet" <cjnolet@gmail.com>
Date: Thu, 25 Jan 2024 18:43:45 -0500
Subject: [PATCH] Let's try again

---
 cpp/template/CMakeLists.txt                  |  2 +-
 cpp/template/cmake/thirdparty/get_cuvs.cmake | 12 +-----------
 cpp/test/CMakeLists.txt                      |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/cpp/template/CMakeLists.txt b/cpp/template/CMakeLists.txt
index 535a73d4e..dc8a70a5f 100644
--- a/cpp/template/CMakeLists.txt
+++ b/cpp/template/CMakeLists.txt
@@ -35,4 +35,4 @@ include(cmake/thirdparty/get_cuvs.cmake)
 
 # -------------- compile tasks ----------------- #
 add_executable(CAGRA_EXAMPLE src/cagra_example.cu)
-target_link_libraries(CAGRA_EXAMPLE PRIVATE cuvs::cuvs)
+target_link_libraries(CAGRA_EXAMPLE PRIVATE cuvs::cuvs $<TARGET_NAME_IF_EXISTS:conda_env>)
diff --git a/cpp/template/cmake/thirdparty/get_cuvs.cmake b/cpp/template/cmake/thirdparty/get_cuvs.cmake
index c77674be0..0b3821e20 100644
--- a/cpp/template/cmake/thirdparty/get_cuvs.cmake
+++ b/cpp/template/cmake/thirdparty/get_cuvs.cmake
@@ -17,15 +17,10 @@ set(CUVS_FORK "rapidsai")
 set(CUVS_PINNED_TAG "branch-${RAPIDS_VERSION}")
 
 function(find_and_configure_cuvs)
-    set(oneValueArgs VERSION FORK PINNED_TAG COMPILE_LIBRARY ENABLE_NVTX)
+    set(oneValueArgs VERSION FORK PINNED_TAG ENABLE_NVTX)
     cmake_parse_arguments(PKG "${options}" "${oneValueArgs}"
             "${multiValueArgs}" ${ARGN} )
 
-    set(CUVS_COMPONENTS "")
-    if(PKG_COMPILE_LIBRARY)
-        string(APPEND CUVS_COMPONENTS " compiled")
-    endif()
-
     #-----------------------------------------------------
     # Invoke CPM find_package()
     #-----------------------------------------------------
@@ -33,17 +28,13 @@ function(find_and_configure_cuvs)
             GLOBAL_TARGETS      cuvs::cuvs
             BUILD_EXPORT_SET    cuvs-template-exports
             INSTALL_EXPORT_SET  cuvs-template-exports
-            COMPONENTS          ${CUVS_COMPONENTS}
             CPM_ARGS
             GIT_REPOSITORY https://github.com/${PKG_FORK}/cuvs.git
             GIT_TAG        ${PKG_PINNED_TAG}
             SOURCE_SUBDIR  cpp
             OPTIONS
             "BUILD_TESTS OFF"
-            "BUILD_PRIMS_BENCH OFF"
-            "BUILD_ANN_BENCH OFF"
             "CUVS_NVTX ${PKG_ENABLE_NVTX}"
-            "CUVS_COMPILE_LIBRARY ${PKG_COMPILE_LIBRARY}"
             )
 endfunction()
 
@@ -53,6 +44,5 @@ endfunction()
 find_and_configure_cuvs(VERSION  ${CUVS_VERSION}.00
         FORK                     ${CUVS_FORK}
         PINNED_TAG               ${CUVS_PINNED_TAG}
-        COMPILE_LIBRARY          ON
         ENABLE_NVTX              OFF
 )
diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt
index ed194eaae..e5880797a 100644
--- a/cpp/test/CMakeLists.txt
+++ b/cpp/test/CMakeLists.txt
@@ -47,7 +47,7 @@ function(ConfigureTest)
   target_link_libraries(
     ${TEST_NAME}
     PRIVATE cuvs
-            raft::raft
+            cuvs::cuvs
             GTest::gtest
             GTest::gtest_main
             Threads::Threads