Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct two issues found when testing CMake 3.27 rc2 #432

Merged
merged 2 commits into from
Jun 27, 2023
Merged

Correct two issues found when testing CMake 3.27 rc2 #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e34f7
Correct missing variable expansion in cpm_rmm
robertmaynard Jun 27, 2023
b8881a7
rapids_cpm_thrust support DOWNLOAD_ONLY
robertmaynard Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rapids-cmake/cpm/rmm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -72,7 +72,7 @@ function(rapids_cpm_rmm)
rapids_cpm_generate_patch_command(rmm ${version} patch_command)

include("${rapids-cmake-dir}/cpm/find.cmake")
rapids_cpm_find(rmm ${version} ${ARGN} {_RAPIDS_UNPARSED_ARGUMENTS}
rapids_cpm_find(rmm ${version} ${ARGN} ${_RAPIDS_UNPARSED_ARGUMENTS}
GLOBAL_TARGETS rmm::rmm
CPM_ARGS
GIT_REPOSITORY ${repository}
Expand Down
3 changes: 2 additions & 1 deletion rapids-cmake/cpm/thrust.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ function(rapids_cpm_thrust NAMESPACE namespaces_name)
${_RAPIDS_INSTALL_EXPORT_SET})
endif()

if(NOT TARGET ${namespaces_name}::Thrust)
# Check for the existence of thrust_create_target so we support fetching Thrust with DOWNLOAD_ONLY
if(NOT TARGET ${namespaces_name}::Thrust AND COMMAND thrust_create_target)
thrust_create_target(${namespaces_name}::Thrust FROM_OPTIONS)
set_target_properties(${namespaces_name}::Thrust PROPERTIES IMPORTED_NO_SYSTEM ON)
if(TARGET _Thrust_Thrust)
Expand Down
2 changes: 1 addition & 1 deletion testing/utils/fill_cache/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ rapids_cpm_nvbench(DOWNLOAD_ONLY ON)
rapids_cpm_rmm(DOWNLOAD_ONLY ON)
rapids_cpm_spdlog(DOWNLOAD_ONLY ON)
rapids_cpm_fmt(DOWNLOAD_ONLY ON)
rapids_cpm_thrust(temp DOWNLOAD_ONLY ON)
rapids_cpm_thrust(NAMESPACE temp DOWNLOAD_ONLY ON)
rapids_cpm_find(skbuild 0.14.1
GIT_REPOSITORY https://github.com/scikit-build/scikit-build.git
GIT_TAG 0.14.1
Expand Down