rapids_cpm cccl packages cmake files are now relocated to not clash with upstream

rapids-cmake/cpm/libcudacxx.cmake

@@ -54,6 +54,32 @@ function(rapids_cpm_libcudacxx)
   include("${rapids-cmake-dir}/cpm/detail/package_details.cmake")
   rapids_cpm_package_details(libcudacxx version repository tag shallow exclude)
 
+  set(to_install OFF)
+  if(INSTALL_EXPORT_SET IN_LIST ARGN AND NOT exclude)
+    set(to_install ON)
+    # By default if we allow libcudacxx to install into `CMAKE_INSTALL_INCLUDEDIR` alongside rmm (or
+    # other packages) we will get a install tree that looks like this:
+
+    # install/include/rmm install/include/cub install/include/libcudacxx
+
+    # This is a problem for CMake+NVCC due to the rules around import targets, and user/system
+    # includes. In this case both rmm and libcudacxx will specify an include path of
+    # `install/include`, while libcudacxx tries to mark it as an user include, since rmm uses
+    # CMake's default of system include. Compilers when provided the same include as both user and
+    # system always goes with system.
+
+    # Now while rmm could also mark `install/include` as system this just pushes the issue to
+    # another dependency which isn't built by RAPIDS and comes by and marks `install/include` as
+    # system.
+
+    # Instead the more reliable option is to make sure that we get libcudacxx to be placed in an
+    # unique include path that the other project will use. In the case of rapids-cmake we install
+    # the headers to `include/rapids/libcudacxx`
+    include(GNUInstallDirs)
+    set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/rapids/libcudacxx")
+    set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/rapids/")
+  endif()
+
   include("${rapids-cmake-dir}/cpm/detail/generate_patch_command.cmake")
   rapids_cpm_generate_patch_command(libcudacxx ${version} patch_command)
 
@@ -65,7 +91,8 @@ function(rapids_cpm_libcudacxx)
                   GIT_TAG ${tag}
                   GIT_SHALLOW ${shallow}
                   PATCH_COMMAND ${patch_command}
-                  EXCLUDE_FROM_ALL ${exclude})
+                  EXCLUDE_FROM_ALL ${exclude}
+                  OPTIONS "libcudacxx_ENABLE_INSTALL_RULES ${to_install}")
 
   include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake")
   rapids_cpm_display_patch_status(libcudacxx)
@@ -82,41 +109,11 @@ function(rapids_cpm_libcudacxx)
                                     ${_RAPIDS_BUILD_EXPORT_SET})
   endif()
 
-  if(libcudacxx_SOURCE_DIR AND _RAPIDS_INSTALL_EXPORT_SET AND NOT exclude)
-    # By default if we allow libcudacxx to install into `CMAKE_INSTALL_INCLUDEDIR` alongside rmm (or
-    # other packages) we will get a install tree that looks like this:
-
-    # install/include/rmm install/include/cub install/include/libcudacxx
-
-    # This is a problem for CMake+NVCC due to the rules around import targets, and user/system
-    # includes. In this case both rmm and libcudacxx will specify an include path of
-    # `install/include`, while libcudacxx tries to mark it as an user include, since rmm uses
-    # CMake's default of system include. Compilers when provided the same include as both user and
-    # system always goes with system.
-
-    # Now while rmm could also mark `install/include` as system this just pushes the issue to
-    # another dependency which isn't built by RAPIDS and comes by and marks `install/include` as
-    # system.
-
-    # Instead the more reliable option is to make sure that we get libcudacxx to be placed in an
-    # unique include path that the other project will use. In the case of rapids-cmake we install
-    # the headers to `include/rapids/libcudacxx`
-    include(GNUInstallDirs)
-    set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/rapids/libcudacxx")
-
-    # libcudacxx 1.8 has a bug where it doesn't generate proper exclude rules for the
-    # `[cub|libcudacxx]-header-search` files, which causes the build tree version to be installed
-    # instead of the install version
-    if(NOT EXISTS "${libcudacxx_BINARY_DIR}/cmake/libcudacxxInstallRulesForRapids.cmake")
-      file(READ "${libcudacxx_SOURCE_DIR}/cmake/libcudacxxInstallRules.cmake" contents)
-      string(REPLACE "PATTERN cub-header-search EXCLUDE" "REGEX cub-header-search.* EXCLUDE"
-                     contents "${contents}")
-      string(REPLACE "PATTERN libcudacxx-header-search EXCLUDE"
-                     "REGEX libcudacxx-header-search.* EXCLUDE" contents "${contents}")
-      file(WRITE "${libcudacxx_BINARY_DIR}/cmake/libcudacxxInstallRulesForRapids.cmake" ${contents})
-    endif()
-    set(libcudacxx_ENABLE_INSTALL_RULES ON)
-    include("${libcudacxx_BINARY_DIR}/cmake/libcudacxxInstallRulesForRapids.cmake")
+  if(to_install)
+    include("${rapids-cmake-dir}/export/find_package_root.cmake")
+    rapids_export_find_package_root(INSTALL libcudacxx
+                                    [=[${CMAKE_CURRENT_LIST_DIR}/../../rapids/cmake/libcudacxx]=]
+                                    ${_RAPIDS_INSTALL_EXPORT_SET})
   endif()
 
   # Propagate up variables that CPMFindPackage provide

rapids-cmake/cpm/patches/libcudacxx/install_rules.diff

@@ -0,0 +1,66 @@
+diff --git a/cmake/libcudacxxInstallRules.cmake b/cmake/libcudacxxInstallRules.cmake
+index 446ccb50..ff622bb7 100644
+--- a/cmake/libcudacxxInstallRules.cmake
++++ b/cmake/libcudacxxInstallRules.cmake
+@@ -1,5 +1,5 @@
+ option(libcudacxx_ENABLE_INSTALL_RULES
+-  "Enable installation of libcudacxx" ${libcudacxx_TOPLEVEL_PROJECT}
++  "Enable installation of libcudacxx" ${LIBCUDACXX_TOPLEVEL_PROJECT}
+ )
+
+ if (NOT libcudacxx_ENABLE_INSTALL_RULES)
+@@ -12,24 +12,27 @@ include(GNUInstallDirs)
+ # Libcudacxx headers
+ install(DIRECTORY "${libcudacxx_SOURCE_DIR}/include/cuda"
+   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++  PATTERN CMakeLists.txt EXCLUDE
+ )
+ install(DIRECTORY "${libcudacxx_SOURCE_DIR}/include/nv"
+   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++  PATTERN CMakeLists.txt EXCLUDE
+ )
+
+ # Libcudacxx cmake package
+ install(DIRECTORY "${libcudacxx_SOURCE_DIR}/lib/cmake/libcudacxx"
+   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake"
+-  PATTERN libcudacxx-header-search EXCLUDE
++  PATTERN *.cmake.in EXCLUDE
+ )
+
+ # Need to configure a file to store CMAKE_INSTALL_INCLUDEDIR
+ # since it can be defined by the user. This is common to work around collisions
+ # with the CTK installed headers.
++set(install_location "${CMAKE_INSTALL_LIBDIR}/cmake/libcudacxx")
+ configure_file("${libcudacxx_SOURCE_DIR}/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in"
+   "${libcudacxx_BINARY_DIR}/lib/cmake/libcudacxx/libcudacxx-header-search.cmake"
+   @ONLY
+ )
+ install(FILES "${libcudacxx_BINARY_DIR}/lib/cmake/libcudacxx/libcudacxx-header-search.cmake"
+-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libcudacxx"
++  DESTINATION "${install_location}"
+ )
+
+diff --git a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
+index 9e7e187c..cb3b946f 100644
+--- a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
++++ b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
+@@ -1,8 +1,18 @@
+ # Parse version information from version header:
+ unset(_libcudacxx_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search
++
++# Find CMAKE_INSTALL_INCLUDEDIR=@CMAKE_INSTALL_INCLUDEDIR@ directory"
++set(from_install_prefix "@install_location@")
++
++# Transform to a list of directories, replace each directory with "../"
++# and convert back to a string
++string(REGEX REPLACE "/" ";" from_install_prefix "${from_install_prefix}")
++list(TRANSFORM from_install_prefix REPLACE ".+" "../")
++list(JOIN from_install_prefix "" from_install_prefix)
++
+ find_path(_libcudacxx_VERSION_INCLUDE_DIR cuda/std/detail/__config
+   NO_DEFAULT_PATH # Only search explicit paths below:
+   PATHS
+-    "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree
++    "${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" # Install tree
+ )
+ set_property(CACHE _libcudacxx_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL)

rapids-cmake/cpm/thrust.cmake

@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (c) 2021, NVIDIA CORPORATION.
+# Copyright (c) 2021-2023, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -56,17 +56,18 @@ Result Variables
 function(rapids_cpm_thrust NAMESPACE namespaces_name)
   list(APPEND CMAKE_MESSAGE_CONTEXT "rapids.cpm.thrust")
 
+  include("${rapids-cmake-dir}/cpm/detail/package_details.cmake")
+  rapids_cpm_package_details(Thrust version repository tag shallow exclude)
+
   set(to_install OFF)
   if(INSTALL_EXPORT_SET IN_LIST ARGN)
     set(to_install ON)
     # Make sure we install thrust into the `include/rapids` subdirectory instead of the default
     include(GNUInstallDirs)
     set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/rapids")
+    set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/rapids")
   endif()
 
-  include("${rapids-cmake-dir}/cpm/detail/package_details.cmake")
-  rapids_cpm_package_details(Thrust version repository tag shallow exclude)
-
   include("${rapids-cmake-dir}/cpm/detail/generate_patch_command.cmake")
   rapids_cpm_generate_patch_command(Thrust ${version} patch_command)
 
@@ -96,6 +97,13 @@ function(rapids_cpm_thrust NAMESPACE namespaces_name)
                                     ${_RAPIDS_BUILD_EXPORT_SET})
   endif()
 
+  if(Thrust_SOURCE_DIR AND _RAPIDS_INSTALL_EXPORT_SET AND to_install)
+    include("${rapids-cmake-dir}/export/find_package_root.cmake")
+    rapids_export_find_package_root(INSTALL Thrust
+                                    [=[${CMAKE_CURRENT_LIST_DIR}/../../rapids/cmake/thrust]=]
+                                    ${_RAPIDS_INSTALL_EXPORT_SET})
+  endif()
+
   if(NOT TARGET ${namespaces_name}::Thrust)
     thrust_create_target(${namespaces_name}::Thrust FROM_OPTIONS)
     set_target_properties(${namespaces_name}::Thrust PROPERTIES IMPORTED_NO_SYSTEM ON)

rapids-cmake/cpm/versions.json

@@ -25,7 +25,14 @@
     "libcudacxx" : {
       "version" : "1.9.1",
       "git_url" : "https://github.com/NVIDIA/libcudacxx.git",
-      "git_tag" : "branch/${version}"
+      "git_tag" : "branch/${version}",
+      "patches" : [
+        {
+          "file" : "libcudacxx/install_rules.diff",
+          "issue" : "libcudacxx 1.X installs incorrect files [https://github.com/NVIDIA/libcudacxx/pull/428]",
+          "fixed_in" : "2.2"
+        }
+      ]
     },
     "nvbench" : {
       "version" : "0.0",

testing/cpm/CMakeLists.txt

@@ -59,6 +59,7 @@ add_cmake_config_test( cpm_gtest-simple.cmake )
 add_cmake_config_test( cpm_libcudacxx-after_cpmfind.cmake )
 add_cmake_config_test( cpm_libcudacxx-export.cmake )
 add_cmake_config_test( cpm_libcudacxx-simple.cmake )
+add_cmake_build_test( cpm_libcudacxx-verify-install-custom-libdir )
 
 add_cmake_config_test( cpm_nvbench-export.cmake )
 add_cmake_config_test( cpm_nvbench-simple.cmake )

testing/cpm/cpm_libcudacxx-verify-install-custom-libdir/CMakeLists.txt

@@ -0,0 +1,62 @@
+#=============================================================================
+# Copyright (c) 2023, NVIDIA CORPORATION.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+cmake_minimum_required(VERSION 3.20)
+
+include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)
+
+include(${rapids-cmake-dir}/cpm/init.cmake)
+include(${rapids-cmake-dir}/export/export.cmake)
+
+project(fake LANGUAGES CXX VERSION 3.1.4)
+
+rapids_cpm_init()
+
+set(CMAKE_INSTALL_LIBDIR "lib/aarch64")
+rapids_cpm_libcudacxx(INSTALL_EXPORT_SET fake_set)
+
+add_library(fakeLib INTERFACE)
+install(TARGETS fakeLib EXPORT fake_set)
+target_link_libraries(fakeLib INTERFACE libcudacxx::libcudacxx)
+
+rapids_export(INSTALL fake
+  EXPORT_SET fake_set
+  NAMESPACE test::
+  )
+
+# Install our project so we can verify `libcudacxx` can be found
+# from a custom install location
+add_custom_target(install_project ALL
+  COMMAND ${CMAKE_COMMAND} --install "${CMAKE_BINARY_DIR}" --prefix install/fake/
+  )
+
+# Add a custom command that verifies that the expect files have
+# been installed for each component
+file(WRITE "${CMAKE_BINARY_DIR}/install/CMakeLists.txt" [=[
+cmake_minimum_required(VERSION 3.20)
+project(verify_install_targets LANGUAGES CXX)
+
+set(computed_path "${CMAKE_CURRENT_SOURCE_DIR}/fake/lib/aarch64/cmake/fake/")
+find_package(fake REQUIRED NO_DEFAULT_PATH HINTS ${computed_path})
+if(NOT TARGET libcudacxx::libcudacxx)
+  message(FATAL_ERROR "Failed to import libcudacxx dependency")
+endif()
+]=])
+
+add_custom_target(verify_install_libcudacxx_works ALL
+  COMMAND ${CMAKE_COMMAND} -E rm -rf "${CMAKE_BINARY_DIR}/install/build"
+  COMMAND ${CMAKE_COMMAND} -S="${CMAKE_BINARY_DIR}/install" -B="${CMAKE_BINARY_DIR}/install/build"
+)
+add_dependencies(verify_install_libcudacxx_works install_project)