-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow nested lib location for nvcomp
Modify rapids_cpm_nvcomp() to allow CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR to be nested directories. This is needed to support building wheels that set these variables in order to put their libraries in their own package directory.
- Loading branch information
1 parent
17927e9
commit 7240793
Showing
5 changed files
with
112 additions
and
66 deletions.
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
80 changes: 80 additions & 0 deletions
80
testing/cpm/cpm_nvcomp-proprietary_binary-lib-location-common.cmake
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,80 @@ | ||
| #============================================================================= | ||
| # Copyright (c) 2024, 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. | ||
| #============================================================================= | ||
| include(${rapids-cmake-dir}/cpm/init.cmake) | ||
| include(${rapids-cmake-dir}/cpm/nvcomp.cmake) | ||
| include(${rapids-cmake-dir}/cpm/package_override.cmake) | ||
|
|
||
|
|
||
| rapids_cpm_init() | ||
|
|
||
| if(TARGET nvcomp::nvcomp) | ||
| message(FATAL_ERROR "Expected nvcomp::nvcomp not to exist") | ||
| endif() | ||
|
|
||
| rapids_cpm_nvcomp(USE_PROPRIETARY_BINARY ON BUILD_EXPORT_SET nvcomp-targets INSTALL_EXPORT_SET nvcomp-targets) | ||
|
|
||
| if(NOT nvcomp_proprietary_binary) | ||
| message(FATAL_ERROR "Ignored nvcomp override file failed to get proprietary binary version") | ||
| endif() | ||
|
|
||
| # Check the contents of the nvcomp-targets-release.cmake file to ensure that | ||
| # every line containing "_IMPORT_PREFIX" also contains "${CMAKE_INSTALL_LIBDIR}" | ||
| file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/_deps/nvcomp_proprietary_binary-src/${CMAKE_INSTALL_LIBDIR}/cmake/nvcomp/nvcomp-targets-release.cmake" nvcomp_targets_release_contents) | ||
| foreach(line IN LISTS nvcomp_targets_release_contents) | ||
| string(FIND "${line}" "_IMPORT_PREFIX" _IMPORT_PREFIX_INDEX) | ||
| if(_IMPORT_PREFIX_INDEX EQUAL -1) | ||
| continue() | ||
| endif() | ||
| get_filename_component(lib_dir_name "${CMAKE_INSTALL_LIBDIR}" NAME) | ||
| string(FIND "${line}" "${lib_dir_name}" _LIBDIR_INDEX) | ||
| if(_LIBDIR_INDEX EQUAL -1) | ||
| message(FATAL_ERROR "nvcomp-targets-release.cmake file does not contain ${lib_dir_name}") | ||
| endif() | ||
| endforeach() | ||
|
|
||
| # Install and check the install directory. | ||
| add_custom_target(install_project ALL | ||
| COMMAND ${CMAKE_COMMAND} --install "${CMAKE_BINARY_DIR}" --prefix check_nvcomp_lib_dir/install/ | ||
| ) | ||
|
|
||
| # Need to capture the install directory based on the binary dir of this project, not the subproject used for testing. | ||
| set(expected_install_dir "${CMAKE_BINARY_DIR}/check_nvcomp_lib_dir/install/") | ||
|
|
||
| # Add a custom command that verifies that the expect files have | ||
| # been installed for each component | ||
| file(WRITE "${CMAKE_BINARY_DIR}/check_nvcomp_lib_dir/CMakeLists.txt" " | ||
| cmake_minimum_required(VERSION 3.26.4) | ||
| project(verify_install_targets LANGUAGES CXX) | ||
| message(\"Checking for ${CMAKE_INSTALL_LIBDIR} directory in ${expected_install_dir}\") | ||
| if (NOT EXISTS ${expected_install_dir}/${CMAKE_INSTALL_LIBDIR}) | ||
| message(FATAL_ERROR \"The ${CMAKE_INSTALL_LIBDIR} directory didn't exist!\") | ||
| endif() | ||
| set(nvcomp_ROOT \"${expected_install_dir}/${CMAKE_INSTALL_LIBDIR}/cmake/nvcomp\") | ||
| find_package(nvcomp REQUIRED) | ||
| file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/stub.cpp\" \" \") | ||
| add_library(uses_nvcomp SHARED stub.cpp) | ||
| target_link_libraries(uses_nvcomp PRIVATE nvcomp::nvcomp) | ||
| ") | ||
|
|
||
| add_custom_target(verify_nvcomp_lib_dir ALL | ||
| COMMAND ${CMAKE_COMMAND} -E rm -rf "${CMAKE_BINARY_DIR}/check_nvcomp_lib_dir/build" | ||
| COMMAND ${CMAKE_COMMAND} -S="${CMAKE_BINARY_DIR}/check_nvcomp_lib_dir" -B="${CMAKE_BINARY_DIR}/install/build" | ||
| ) | ||
| add_dependencies(verify_nvcomp_lib_dir install_project) |
19 changes: 19 additions & 0 deletions
19
testing/cpm/cpm_nvcomp-proprietary_binary-lib-location-nested.cmake
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,19 @@ | ||
| #============================================================================= | ||
| # Copyright (c) 2024, 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. | ||
| #============================================================================= | ||
|
|
||
| set(CMAKE_INSTALL_LIBDIR "nested/lib64") | ||
| set(CMAKE_INSTALL_INCLUDEDIR "nested/include") | ||
| include("${CMAKE_CURRENT_LIST_DIR}/cpm_nvcomp-proprietary_binary-lib-location-common.cmake") |
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