Fix errors when find_package(CCCL) is called twice. (NVIDIA#1157)

Fixes NVIDIA#1156.
miscco · Jan 18, 2024 · 6cfc621 · 6cfc621
1 parent 1d3279e
commit 6cfc621
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/cmake/cccl/cccl-config.cmake b/lib/cmake/cccl/cccl-config.cmake
@@ -71,7 +71,7 @@ foreach(component IN LISTS components)
         "${cccl_cmake_dir}/.."                            # Install layout
     )
 
-    if (TARGET Thrust::Thrust AND NOT CCCL::Thrust)
+    if (TARGET Thrust::Thrust AND NOT TARGET CCCL::Thrust)
       # By default, configure a CCCL::Thrust target with host=cpp device=cuda
       option(CCCL_ENABLE_DEFAULT_THRUST_TARGET
         "Create a CCCL::Thrust target using CCCL_THRUST_[HOST|DEVICE]_SYSTEM."

diff --git a/test/cmake/test_export/CMakeLists.txt b/test/cmake/test_export/CMakeLists.txt
@@ -66,6 +66,8 @@ function(do_find_package pkg_name pkg_prefix)
   if (NOT ${pkg_name}_FOUND)
     message(FATAL_ERROR "Failed: find_package(${pkg_name} ${arg_str})")
   endif()
+  # Re-execute find_package to ensure that repeated calls don't break:
+  find_package(${pkg_name} ${arg_list})
 endfunction()
 
 # Run find package with the requested configuration: