diff options
| author | Brad King <brad.king@kitware.com> | 2023-07-24 12:43:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-07-24 12:43:19 (GMT) |
| commit | 6194193a8a0a476539590aabbb27094d1aff136a (patch) | |
| tree | 7b56eea1985a37978b58b64c35c53bf4c682d571 /Modules/FindCUDAToolkit.cmake | |
| parent | e61a51b5a247bec564cb48184b499d17386c0470 (diff) | |
| parent | 6b5f2dbbfe453f9bafe46ee420e657735ff16fb0 (diff) | |
| download | CMake-6194193a8a0a476539590aabbb27094d1aff136a.zip CMake-6194193a8a0a476539590aabbb27094d1aff136a.tar.gz CMake-6194193a8a0a476539590aabbb27094d1aff136a.tar.bz2 | |
Merge topic 'file-REAL_PATH-relative'
6b5f2dbbfe file(REAL_PATH): resolve symlinks before '..' components
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8605
Diffstat (limited to 'Modules/FindCUDAToolkit.cmake')
| -rw-r--r-- | Modules/FindCUDAToolkit.cmake | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index c2627e7..e9b7ae4 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake @@ -965,12 +965,15 @@ if(CUDAToolkit_FOUND) # search paths without symlinks if(CUDAToolkit_LIBRARY_DIR MATCHES ".*/cuda/${CUDAToolkit_VERSION_MAJOR}.${CUDAToolkit_VERSION_MINOR}/lib64$") # Search location for math_libs/ - file(REAL_PATH "${CUDAToolkit_LIBRARY_DIR}/../../../" _cmake_search_dir) - list(APPEND CUDAToolkit_LIBRARY_SEARCH_DIRS "${_cmake_search_dir}") - - # Search location for extras like cupti - file(REAL_PATH "${CUDAToolkit_LIBRARY_DIR}/../" _cmake_search_dir) - list(APPEND CUDAToolkit_LIBRARY_SEARCH_DIRS "${_cmake_search_dir}") + block(SCOPE_FOR POLICIES) + cmake_policy(SET CMP0152 NEW) + file(REAL_PATH "${CUDAToolkit_LIBRARY_DIR}/../../../../../" _cmake_search_dir) + list(APPEND CUDAToolkit_LIBRARY_SEARCH_DIRS "${_cmake_search_dir}") + + # Search location for extras like cupti + file(REAL_PATH "${CUDAToolkit_LIBRARY_DIR}/../../../" _cmake_search_dir) + list(APPEND CUDAToolkit_LIBRARY_SEARCH_DIRS "${_cmake_search_dir}") + endblock() endif() # If no `CUDAToolkit_LIBRARY_ROOT` exists set it based on CUDAToolkit_LIBRARY_DIR |