Pass GLOBAL_TARGETS to rapids_cpm_find in rapids_cpm_bs_thread_pool() (…

…#655) Because the GLOBAL_TARGETS option was not being passed, rapids_cpm_bs_thread_pool() was accidentally calling CPMAddPackage() twice for bs_thread_pool, resulting in invalid pinned versions output. Pass GLOBAL_TARGETS to ensure CPMAddPackage() is only called once.
rapidsai · Jul 24, 2024 · 1dbd2a9 · 1dbd2a9
1 parent 26aacf9
commit 1dbd2a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/rapids-cmake/cpm/bs_thread_pool.cmake b/rapids-cmake/cpm/bs_thread_pool.cmake
@@ -71,6 +71,7 @@ function(rapids_cpm_bs_thread_pool)
 
   include("${rapids-cmake-dir}/cpm/find.cmake")
   rapids_cpm_find(bs_thread_pool ${version} ${ARGN}
+                  GLOBAL_TARGETS rapids_bs_thread_pool
                   CPM_ARGS
                   GIT_REPOSITORY ${repository}
                   GIT_TAG ${tag}

diff --git a/testing/cpm/cpm_bs_thread_pool-simple.cmake b/testing/cpm/cpm_bs_thread_pool-simple.cmake
@@ -32,3 +32,6 @@ if(NOT TARGET BS::thread_pool)
 endif()
 
 rapids_cpm_bs_thread_pool()
+
+include(${rapids-cmake-dir}/cpm/generate_pinned_versions.cmake)
+rapids_cpm_generate_pinned_versions(OUTPUT ${CMAKE_BINARY_DIR}/versions.json)