From 7561141aee9aca1b13f00221f4b8a48c50d94b81 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 10 Oct 2023 15:59:57 -0400 Subject: [PATCH] Update rapids-cmake functions to non-deprecated signatures (#1884) Update to use non deprecated signatures for `rapids_export` functions Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Corey J. Nolet (https://github.com/cjnolet) URL: https://github.com/rapidsai/raft/pull/1884 --- cpp/cmake/thirdparty/get_cutlass.cmake | 6 ++++-- cpp/cmake/thirdparty/get_faiss.cmake | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cpp/cmake/thirdparty/get_cutlass.cmake b/cpp/cmake/thirdparty/get_cutlass.cmake index 853fd7c52f..0123c4b07a 100644 --- a/cpp/cmake/thirdparty/get_cutlass.cmake +++ b/cpp/cmake/thirdparty/get_cutlass.cmake @@ -70,10 +70,12 @@ function(find_and_configure_cutlass) # Tell cmake where it can find the generated NvidiaCutlass-config.cmake we wrote. include("${rapids-cmake-dir}/export/find_package_root.cmake") rapids_export_find_package_root( - INSTALL NvidiaCutlass [=[${CMAKE_CURRENT_LIST_DIR}/../]=] raft-exports + INSTALL NvidiaCutlass [=[${CMAKE_CURRENT_LIST_DIR}/../]=] + EXPORT_SET raft-exports ) rapids_export_find_package_root( - BUILD NvidiaCutlass [=[${CMAKE_CURRENT_LIST_DIR}]=] raft-exports + BUILD NvidiaCutlass [=[${CMAKE_CURRENT_LIST_DIR}]=] + EXPORT_SET raft-exports ) endfunction() diff --git a/cpp/cmake/thirdparty/get_faiss.cmake b/cpp/cmake/thirdparty/get_faiss.cmake index b7c132f2f1..680199509d 100644 --- a/cpp/cmake/thirdparty/get_faiss.cmake +++ b/cpp/cmake/thirdparty/get_faiss.cmake @@ -63,7 +63,8 @@ function(find_and_configure_faiss) # Tell cmake where it can find the generated faiss-config.cmake we wrote. include("${rapids-cmake-dir}/export/find_package_root.cmake") - rapids_export_find_package_root(BUILD faiss [=[${CMAKE_CURRENT_LIST_DIR}]=] raft-ann-bench-exports) + rapids_export_find_package_root(BUILD faiss [=[${CMAKE_CURRENT_LIST_DIR}]=] + EXPORT_SET raft-ann-bench-exports) endfunction() if(NOT RAFT_FAISS_GIT_TAG)