summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-09-29 13:37:06 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-09-29 13:37:30 (GMT)
commitaf149fbcaa1f514272e5774e878f4c5531747263 (patch)
tree52b2bdbf220b79a99ae661acaed470679e529c0e /Tests
parentb3205afcdedd645cd2d77eda82479008fe703f1c (diff)
parent4316d4dcfd00bd261f7902de68013522bdb9933b (diff)
downloadCMake-af149fbcaa1f514272e5774e878f4c5531747263.zip
CMake-af149fbcaa1f514272e5774e878f4c5531747263.tar.gz
CMake-af149fbcaa1f514272e5774e878f4c5531747263.tar.bz2
Merge topic 'FindCUDAToolkit-implicit-dirs'
4316d4dcfd FindCUDAToolkit: Search all of `nvcc` implicit includes and library dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8835
Diffstat (limited to 'Tests')
-rw-r--r--Tests/Cuda/Toolkit/CMakeLists.txt8
-rw-r--r--Tests/CudaOnly/Toolkit/CMakeLists.txt16
2 files changed, 20 insertions, 4 deletions
diff --git a/Tests/Cuda/Toolkit/CMakeLists.txt b/Tests/Cuda/Toolkit/CMakeLists.txt
index 8432b71..c2989f0 100644
--- a/Tests/Cuda/Toolkit/CMakeLists.txt
+++ b/Tests/Cuda/Toolkit/CMakeLists.txt
@@ -26,9 +26,11 @@ set(should_exist
CUDAToolkit_LIBRARY_ROOT
)
foreach (cuda_loc_var IN LISTS should_exist)
- if(NOT EXISTS "${${cuda_loc_var}}")
- message(FATAL_ERROR "${cuda_loc_var} variable is expected to be set to valid path")
- endif()
+ foreach (entry IN LISTS ${cuda_loc_var})
+ if(NOT EXISTS "${entry}")
+ message(FATAL_ERROR "${cuda_loc_var} variable is expected to be set to valid path")
+ endif()
+ endforeach()
endforeach()
diff --git a/Tests/CudaOnly/Toolkit/CMakeLists.txt b/Tests/CudaOnly/Toolkit/CMakeLists.txt
index e0801a3..506fc9f 100644
--- a/Tests/CudaOnly/Toolkit/CMakeLists.txt
+++ b/Tests/CudaOnly/Toolkit/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.15)
-project(CudaOnlyToolkit CUDA)
+project(CudaOnlyToolkit LANGUAGES CUDA)
find_package(CUDAToolkit REQUIRED)
if(NOT DEFINED CUDAToolkit_VERSION)
@@ -13,8 +13,22 @@ message(STATUS "CUDAToolkit_VERSION_PATCH: ${CUDAToolkit_VERSION_PATCH}")
message(STATUS "CUDAToolkit_BIN_DIR: ${CUDAToolkit_BIN_DIR}")
message(STATUS "CUDAToolkit_INCLUDE_DIRS: ${CUDAToolkit_INCLUDE_DIRS}")
message(STATUS "CUDAToolkit_LIBRARY_DIR: ${CUDAToolkit_LIBRARY_DIR}")
+message(STATUS "CUDAToolkit_LIBRARY_ROOT: ${CUDAToolkit_LIBRARY_ROOT}")
message(STATUS "CUDAToolkit_NVCC_EXECUTABLE ${CUDAToolkit_NVCC_EXECUTABLE}")
+set(should_exist
+ CUDAToolkit_BIN_DIR
+ CUDAToolkit_INCLUDE_DIRS
+ CUDAToolkit_LIBRARY_DIR
+ CUDAToolkit_LIBRARY_ROOT
+ )
+foreach (cuda_loc_var IN LISTS should_exist)
+ foreach (entry IN LISTS ${cuda_loc_var})
+ if(NOT EXISTS "${entry}")
+ message(FATAL_ERROR "${cuda_loc_var}[${entry}] variable is expected to be set to valid path")
+ endif()
+ endforeach()
+endforeach()
set(cuda_libs cudart cuda_driver cublas cufft cufftw curand cusolver cusparse)
if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 10.1)