Skip to content

Commit

Permalink
rapids_cpm_cccl use proper CCCL version value to compute install rules (
Browse files Browse the repository at this point in the history
#742)

We can't use the request versions.json version value as it might be 2.7 and we found >= 2.8

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: #742
  • Loading branch information
robertmaynard authored Jan 16, 2025
1 parent 549c677 commit fa580e5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions rapids-cmake/cpm/cccl.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2023-2024, NVIDIA CORPORATION.
# Copyright (c) 2023-2025, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -102,8 +102,8 @@ function(rapids_cpm_cccl)

set_property(GLOBAL PROPERTY rapids_cmake_cccl_install_rules ON)
# CCCL < 2.8 does not currently correctly support installation of cub/thrust/libcudacxx in a
# subdirectory
if(version VERSION_LESS 2.8)
# subdirectory CCCL_VERSION doesn't exist when using `add_subdirectory`
if(LIBCUDACXX_VERSION VERSION_LESS 2.8)
set(Thrust_SOURCE_DIR "${CCCL_SOURCE_DIR}/thrust")
set(CUB_SOURCE_DIR "${CCCL_SOURCE_DIR}/cub")
set(libcudacxx_SOURCE_DIR "${CCCL_SOURCE_DIR}/libcudacxx")
Expand Down
6 changes: 3 additions & 3 deletions testing/cpm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ add_cmake_build_test( cpm_bs_thread_pool-install-config-works.cmake )

add_cmake_config_test( cpm_cccl-simple.cmake )
add_cmake_config_test( cpm_cccl-export.cmake )
add_cmake_build_test( cpm_cccl-version-2-5.cmake )
add_cmake_build_test( cpm_cccl-version-2-7.cmake )
add_cmake_build_test( cpm_cccl-version-2-8.cmake )
add_cmake_build_test( cpm_cccl-version-2-5.cmake NO_CPM_CACHE )
add_cmake_build_test( cpm_cccl-version-2-7.cmake NO_CPM_CACHE )
add_cmake_build_test( cpm_cccl-version-2-8.cmake NO_CPM_CACHE )
add_cmake_build_test( cpm_cccl-preserve-custom-install-loc )

add_cmake_config_test( cpm_cuco-simple.cmake )
Expand Down

0 comments on commit fa580e5

Please sign in to comment.