-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rapids_cpm_cccl preserve install location details from first invocation.
Previously we would run the install rules each time rapids_cpm_cccl was called, since we checked for `CCCL_SOURCE_DIR` and that could have been defined by an earlier invocation at the same scope. This causes issue when the first invocation of `rapids_cpm_cccl` used a custom install location. CMake's install rules would use the first location, but CCCL install files would contain the second location since they got re-configured on each execution.
- Loading branch information
1 parent
7d2b702
commit 662fbf5
Showing
3 changed files
with
85 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
testing/cpm/cpm_cccl-preserve-custom-install-loc/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#============================================================================= | ||
# 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.23) | ||
|
||
include(${rapids-cmake-dir}/cpm/init.cmake) | ||
include(${rapids-cmake-dir}/cpm/cccl.cmake) | ||
|
||
project(fake LANGUAGES CXX VERSION 3.1.4) | ||
|
||
rapids_cpm_init() | ||
|
||
include(GNUInstallDirs) | ||
|
||
function(call_cccl_with_custom_install_loc) | ||
set(CMAKE_INSTALL_LIBDIR "custom/lib/aarch64") | ||
set(CMAKE_INSTALL_INCLUDEDIR "custom/include/aarch64") | ||
rapids_cpm_cccl(INSTALL_EXPORT_SET export_set) | ||
endfunction() | ||
|
||
# We will install with the custom install location set in this file | ||
call_cccl_with_custom_install_loc() | ||
|
||
# Call for `cccl` again but ensure we don't re-invoke the install | ||
# rules overwriting the custom install location in files | ||
# like thrust-header-search.cmake | ||
rapids_cpm_cccl(INSTALL_EXPORT_SET export_set) | ||
|
||
# Install our project so we can verify `cccl`/`thrust` has preserved | ||
# the correct install location | ||
add_custom_target(install_project ALL | ||
COMMAND ${CMAKE_COMMAND} --install "${CMAKE_BINARY_DIR}" --prefix check_thrust/install/ | ||
) | ||
|
||
# Add a custom command that verifies that the expect files have | ||
# been installed for each component | ||
file(WRITE "${CMAKE_BINARY_DIR}/check_thrust/CMakeLists.txt" [=[ | ||
cmake_minimum_required(VERSION 3.20) | ||
project(verify_install_targets LANGUAGES CXX) | ||
|
||
set(computed_dir "${CMAKE_CURRENT_SOURCE_DIR}/install/custom/lib/aarch64/rapids/cmake/thrust/") | ||
set(header_search_file "${computed_dir}/thrust-header-search.cmake") | ||
|
||
if(NOT EXISTS ${header_search_file}) | ||
message(FATAL_ERROR "Failed to compute thrust-header-search.cmake location") | ||
endif() | ||
|
||
include("${header_search_file}") | ||
# The `from_install_prefix` should be "custom/lib/aarch64/rapids/cmake/thrust" which | ||
# will be transformed into `../../../../../../` | ||
set(expected "../../../../../../") | ||
if(NOT from_install_prefix STREQUAL expected) | ||
message(FATAL_ERROR "thrust-header-search.cmake contains the wrong 'from_install_prefix'. Expected '${expected}' but found '${from_install_prefix}'") | ||
endif() | ||
]=]) | ||
|
||
|
||
add_custom_target(verify_thrust_header_search ALL | ||
COMMAND ${CMAKE_COMMAND} -E rm -rf "${CMAKE_BINARY_DIR}/check_thrust/build" | ||
COMMAND ${CMAKE_COMMAND} -S="${CMAKE_BINARY_DIR}/check_thrust" -B="${CMAKE_BINARY_DIR}/install/build" | ||
) | ||
add_dependencies(verify_thrust_header_search install_project) |