Skip to content

Commit 35f21e6

Browse files
authored
Use vendored RAPIDS.cmake in example code. (#824)
Fixes example CMake code to use the vendored RAPIDS.cmake introduced in #816. xref: rapidsai/build-infra#206 Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ben Frederickson (https://github.com/benfred) URL: #824
1 parent 52f9fca commit 35f21e6

5 files changed

Lines changed: 6 additions & 27 deletions

File tree

cpp/cmake/thirdparty/get_cuvs.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# or implied. See the License for the specific language governing permissions and limitations under
1212
# the License.
1313

14-
# Use RAPIDS_VERSION_MAJOR_MINOR from rapids_config.cmake
14+
# Use RAPIDS_VERSION_MAJOR_MINOR from cmake/rapids_config.cmake
1515
set(CUVS_VERSION "${RAPIDS_VERSION_MAJOR_MINOR}")
1616
set(CUVS_FORK "rapidsai")
1717
set(CUVS_PINNED_TAG "branch-${RAPIDS_VERSION_MAJOR_MINOR}")

examples/c/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
1515

1616
# ------------- configure rapids-cmake --------------#
1717

18-
include(../cmake/thirdparty/fetch_rapids.cmake)
18+
include(../../cmake/rapids_config.cmake)
1919
include(rapids-cmake)
2020
include(rapids-cpm)
2121
include(rapids-cuda)

examples/cmake/thirdparty/fetch_rapids.cmake

Lines changed: 0 additions & 21 deletions
This file was deleted.

examples/cmake/thirdparty/get_cuvs.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
# or implied. See the License for the specific language governing permissions and limitations under
1212
# the License.
1313

14-
# Use RAPIDS_VERSION from cmake/thirdparty/fetch_rapids.cmake
15-
set(CUVS_VERSION "${RAPIDS_VERSION}")
14+
# Use RAPIDS_VERSION_MAJOR_MINOR from cmake/rapids_config.cmake
15+
set(CUVS_VERSION "${RAPIDS_VERSION_MAJOR_MINOR}")
1616
set(CUVS_FORK "rapidsai")
17-
set(CUVS_PINNED_TAG "branch-${RAPIDS_VERSION}")
17+
set(CUVS_PINNED_TAG "branch-${RAPIDS_VERSION_MAJOR_MINOR}")
1818

1919
function(find_and_configure_cuvs)
2020
set(oneValueArgs VERSION FORK PINNED_TAG ENABLE_NVTX BUILD_CUVS_C_LIBRARY)

examples/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
1515

1616
# ------------- configure rapids-cmake --------------#
1717

18-
include(../cmake/thirdparty/fetch_rapids.cmake)
18+
include(../../cmake/rapids_config.cmake)
1919
include(rapids-cmake)
2020
include(rapids-cpm)
2121
include(rapids-cuda)

0 commit comments

Comments
 (0)