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

Remove deprecated function usages #484

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Remove deprecated function usages #484

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
1571ae7
Remove 23.12 deprecated function usages
robertmaynard Nov 13, 2023
e0682a7
Remove invalid argument to find_package_root
robertmaynard Nov 13, 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
2 changes: 1 addition & 1 deletion rapids-cmake/cpm/libcudacxx.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function(rapids_cpm_libcudacxx)
if(libcudacxx_SOURCE_DIR)
# Store where CMake can find our custom libcudacxx
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD libcudacxx "${libcudacxx_SOURCE_DIR}/lib/cmake" FOR
rapids_export_find_package_root(BUILD libcudacxx "${libcudacxx_SOURCE_DIR}/lib/cmake"
EXPORT_SET ${_RAPIDS_BUILD_EXPORT_SET})
rapids_export_find_package_root(INSTALL libcudacxx
[=[${CMAKE_CURRENT_LIST_DIR}/../../rapids/cmake/libcudacxx]=]
Expand Down
18 changes: 5 additions & 13 deletions rapids-cmake/find/generate_module.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,19 +211,11 @@ function(rapids_find_generate_module name)
endif()

# Record what export sets this module is part of
if(_RAPIDS_BUILD_EXPORT_SET)
include("${rapids-cmake-dir}/export/find_package_file.cmake")
rapids_export_find_package_file(BUILD
"${CMAKE_BINARY_DIR}/cmake/find_modules/Find${name}.cmake"
${_RAPIDS_BUILD_EXPORT_SET})
endif()

if(_RAPIDS_INSTALL_EXPORT_SET)
include("${rapids-cmake-dir}/export/find_package_file.cmake")
rapids_export_find_package_file(INSTALL
"${CMAKE_BINARY_DIR}/cmake/find_modules/Find${name}.cmake"
${_RAPIDS_INSTALL_EXPORT_SET})
endif()
include("${rapids-cmake-dir}/export/find_package_file.cmake")
rapids_export_find_package_file(BUILD "${CMAKE_BINARY_DIR}/cmake/find_modules/Find${name}.cmake"
EXPORT_SET ${_RAPIDS_BUILD_EXPORT_SET})
rapids_export_find_package_file(INSTALL "${CMAKE_BINARY_DIR}/cmake/find_modules/Find${name}.cmake"
EXPORT_SET ${_RAPIDS_INSTALL_EXPORT_SET})
endfunction()

cmake_policy(POP)
6 changes: 3 additions & 3 deletions testing/export/write_dependencies-root-dirs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
include(${rapids-cmake-dir}/export/find_package_root.cmake)
include(${rapids-cmake-dir}/export/write_dependencies.cmake)

rapids_export_find_package_root(BUILD RMM [=[${CMAKE_CURRENT_LIST_DIR}/fake/build/path]=] test_set)
rapids_export_find_package_root(BUILD RMM [=[${CMAKE_CURRENT_LIST_DIR}/fake/build/path]=] EXPORT_SET test_set)
rapids_export_write_dependencies(build test_set "${CMAKE_CURRENT_BINARY_DIR}/build_export_set.cmake")

rapids_export_find_package_root(BUILD RMM "/bad/install/path" EXPORT_SET ${unknown_var}) #ignored
Expand All @@ -32,11 +32,11 @@ if(is_found EQUAL -1)
endif()

rapids_export_find_package_root(install RMM "/first/install/path" EXPORT_SET test_set)
rapids_export_find_package_root(INSTALL RMM "/second/install/path" test_set)
rapids_export_find_package_root(INSTALL RMM "/second/install/path" EXPORT_SET test_set)
set(to_install FALSE)
rapids_export_find_package_root(INSTALL RMM "/bad/install/path" EXPORT_SET test_set CONDITION to_install) #ignored

rapids_export_find_package_root(install PKG2 "/pkg2/install/path" test_set)
rapids_export_find_package_root(install PKG2 "/pkg2/install/path" EXPORT_SET test_set)
rapids_export_write_dependencies(INSTALL test_set "${CMAKE_CURRENT_BINARY_DIR}/install_export_set.cmake")

set(install_to_match_string_1 [=[set(RMM_ROOT "/first/install/path;/second/install/path"]=])
Expand Down