diff --git a/rapids-cmake/cpm/patches/cccl/install_rules.diff b/rapids-cmake/cpm/patches/cccl/install_rules.diff new file mode 100644 index 00000000..789e1c2b --- /dev/null +++ b/rapids-cmake/cpm/patches/cccl/install_rules.diff @@ -0,0 +1,39 @@ +diff --git a/cub/cmake/CubInstallRules.cmake b/cub/cmake/CubInstallRules.cmake +index d26da438e..a8b3b1940 100644 +--- a/cub/cmake/CubInstallRules.cmake ++++ b/cub/cmake/CubInstallRules.cmake +@@ -12,7 +12,7 @@ install(DIRECTORY "${CUB_SOURCE_DIR}/cub" + + install(DIRECTORY "${CUB_SOURCE_DIR}/cub/cmake/" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cub" +- PATTERN *.cmake.in EXCLUDE ++ REGEX "(.*-header-search\.cmake|.*\.cmake\.in)" EXCLUDE + ) + # Need to configure a file to store the infix specified in + # CMAKE_INSTALL_INCLUDEDIR since it can be defined by the user +diff --git a/libcudacxx/cmake/libcudacxxInstallRules.cmake b/libcudacxx/cmake/libcudacxxInstallRules.cmake +index f99a5606f..1c1ed5cb0 100644 +--- a/libcudacxx/cmake/libcudacxxInstallRules.cmake ++++ b/libcudacxx/cmake/libcudacxxInstallRules.cmake +@@ -22,7 +22,7 @@ install(DIRECTORY "${libcudacxx_SOURCE_DIR}/include/nv" + # Libcudacxx cmake package + install(DIRECTORY "${libcudacxx_SOURCE_DIR}/lib/cmake/libcudacxx" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake" +- PATTERN *.cmake.in EXCLUDE ++ REGEX "(.*-header-search\.cmake|.*\.cmake\.in)" EXCLUDE + ) + + # Need to configure a file to store CMAKE_INSTALL_INCLUDEDIR +diff --git a/thrust/cmake/ThrustInstallRules.cmake b/thrust/cmake/ThrustInstallRules.cmake +index 0898d3964..54b40e515 100644 +--- a/thrust/cmake/ThrustInstallRules.cmake ++++ b/thrust/cmake/ThrustInstallRules.cmake +@@ -13,7 +13,7 @@ install(DIRECTORY "${Thrust_SOURCE_DIR}/thrust" + + install(DIRECTORY "${Thrust_SOURCE_DIR}/thrust/cmake/" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/thrust" +- PATTERN *.cmake.in EXCLUDE ++ REGEX "(.*-header-search\.cmake|.*\.cmake\.in)" EXCLUDE + ) + # Need to configure a file to store the infix specified in + # CMAKE_INSTALL_INCLUDEDIR since it can be defined by the user diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 500bf497..561b8214 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -8,7 +8,14 @@ "CCCL" : { "version" : "2.2.0", "git_url" : "https://github.com/NVIDIA/cccl.git", - "git_tag" : "v${version}" + "git_tag" : "v${version}", + "patches" : [ + { + "file" : "cccl/install_rules.diff", + "issue" : "CCCL installs header-search.cmake files in nondeterministic order", + "fixed_in" : "2.3" + } + ] }, "cuco" : { "version" : "0.0.1",