diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-15 14:31:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-15 14:31:59 (GMT) |
| commit | e42eaa43425887b28f985f8a524dbcba8aab4a7e (patch) | |
| tree | 4b336c23af6ee155f860377afb6f3e405d775b4a /Modules | |
| parent | a903e3b5408ef0d7a718f822edde5a6f316118bd (diff) | |
| parent | 04959e0285a1473a40b5053b453988aff9bb7534 (diff) | |
| download | CMake-e42eaa43425887b28f985f8a524dbcba8aab4a7e.zip CMake-e42eaa43425887b28f985f8a524dbcba8aab4a7e.tar.gz CMake-e42eaa43425887b28f985f8a524dbcba8aab4a7e.tar.bz2 | |
Merge topic 'FindCUDAToolkit-cupti' into release-3.28
04959e0285 Tests: Verify CUDA::cupti existence on a subset of machines
09a3c8b46b CUDAToolkit: Correctly search all include paths from compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9072
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDAToolkit.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index b4c596c..469a7ad 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake @@ -960,7 +960,7 @@ endif() # the version of the CUDA toolchain # Create a separate variable so this directory can be selectively added to math targets. find_path(CUDAToolkit_CUBLAS_INCLUDE_DIR cublas_v2.h PATHS - "${CUDAToolkit_INCLUDE_DIRECTORIES}" + ${CUDAToolkit_INCLUDE_DIRECTORIES} NO_DEFAULT_PATH) if(NOT CUDAToolkit_CUBLAS_INCLUDE_DIR) @@ -973,7 +973,7 @@ if(NOT CUDAToolkit_CUBLAS_INCLUDE_DIR) cmake_path(NORMAL_PATH CUDAToolkit_MATH_INCLUDE_DIR) find_path(CUDAToolkit_CUBLAS_INCLUDE_DIR cublas_v2.h PATHS - "${CUDAToolkit_INCLUDE_DIRECTORIES}" + ${CUDAToolkit_INCLUDE_DIRECTORIES} ) if(CUDAToolkit_CUBLAS_INCLUDE_DIR) list(APPEND CUDAToolkit_INCLUDE_DIRECTORIES "${CUDAToolkit_CUBLAS_INCLUDE_DIR}") @@ -1246,7 +1246,7 @@ if(CUDAToolkit_FOUND) find_path(CUDAToolkit_CUPTI_INCLUDE_DIR cupti.h PATHS "${CUDAToolkit_ROOT_DIR}/extras/CUPTI/include" - "${CUDAToolkit_INCLUDE_DIRS}" + ${CUDAToolkit_INCLUDE_DIRS} PATH_SUFFIXES "../extras/CUPTI/include" "../../../extras/CUPTI/include" NO_DEFAULT_PATH) |