From c503435848ebabd5854d381f5bdb71a04e51d856 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 8 Aug 2022 13:42:12 -0400 Subject: [PATCH 1/2] Use rapids-cmake 22.10 best practice for RAPIDS.cmake location Removes possiblity of another projects RAPIDS.cmake being used, and removes need to always download a version. --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 944fdbca1..431f8833f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,11 @@ cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR) -file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake - ${CMAKE_BINARY_DIR}/RAPIDS.cmake) -include(${CMAKE_BINARY_DIR}/RAPIDS.cmake) +if(NOT EXISTS ${CMAKE_BINARY_DIR}/RMM_RAPIDS.cmake) + file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake + ${CMAKE_BINARY_DIR}/RMM_RAPIDS.cmake) +endif() +include(${CMAKE_BINARY_DIR}/RMM_RAPIDS.cmake) include(rapids-cmake) include(rapids-cpm) From abd5560c80a87a3b613b47e1b68429c482bc1a62 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 8 Aug 2022 13:46:35 -0400 Subject: [PATCH 2/2] Use current binary dir --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 431f8833f..ce246596e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,11 +14,11 @@ cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR) -if(NOT EXISTS ${CMAKE_BINARY_DIR}/RMM_RAPIDS.cmake) +if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake - ${CMAKE_BINARY_DIR}/RMM_RAPIDS.cmake) + ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) endif() -include(${CMAKE_BINARY_DIR}/RMM_RAPIDS.cmake) +include(${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) include(rapids-cmake) include(rapids-cpm)