From 607d271b1f8f8b6551bb9b4f3ca2acc50b41503b Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 18 Jan 2024 14:22:39 -0500 Subject: Tests: Do not expect nvToolsExt in CUDA 12 toolkit --- Tests/Cuda/Toolkit/CMakeLists.txt | 6 +++++- Tests/CudaOnly/Toolkit/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Tests/Cuda/Toolkit/CMakeLists.txt b/Tests/Cuda/Toolkit/CMakeLists.txt index 4255b82..08ba20a 100644 --- a/Tests/Cuda/Toolkit/CMakeLists.txt +++ b/Tests/Cuda/Toolkit/CMakeLists.txt @@ -70,7 +70,11 @@ foreach (cuda_lib IN LISTS npp_libs) endif() endforeach() -foreach (cuda_lib nvrtc nvToolsExt OpenCL) +set(nv_libs nvrtc OpenCL) +if(CUDAToolkit_VERSION_MAJOR VERSION_LESS 12) + list(APPEND nv_libs nvToolsExt) +endif() +foreach (cuda_lib IN LISTS nv_libs) if(NOT TARGET CUDA::${cuda_lib}) message(FATAL_ERROR "The CUDA::${cuda_lib} target was expected but couldn't be found") endif() diff --git a/Tests/CudaOnly/Toolkit/CMakeLists.txt b/Tests/CudaOnly/Toolkit/CMakeLists.txt index df1c44c..477c816 100644 --- a/Tests/CudaOnly/Toolkit/CMakeLists.txt +++ b/Tests/CudaOnly/Toolkit/CMakeLists.txt @@ -68,7 +68,11 @@ foreach (cuda_lib IN LISTS npp_libs) endif() endforeach() -foreach (cuda_lib nvrtc nvToolsExt OpenCL) +set(nv_libs nvrtc OpenCL) +if(CUDAToolkit_VERSION_MAJOR VERSION_LESS 12) + list(APPEND nv_libs nvToolsExt) +endif() +foreach (cuda_lib IN LISTS nv_libs) if(NOT CUDA_${cuda_lib}_LIBRARY) message(FATAL_ERROR "expected CUDAToolkit variable CUDA_${cuda_lib}_LIBRARY not found") elseif(CUDA_${cuda_lib}_LIBRARY MATCHES [[\.\./]]) -- cgit v0.12