From 938d9da2eef95b33e68f6c998905c85716ec632f Mon Sep 17 00:00:00 2001
From: Thorsten Hater <24411438+thorstenhater@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:17:46 +0100
Subject: [PATCH] Revert to use FindCuda in CMake (#1860)
---
CMakeLists.txt | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94365d11..0bd94e50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,13 +120,16 @@ if(ARB_GPU STREQUAL "cuda")
set(CMAKE_CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER})
enable_language(CUDA)
find_package(CUDAToolkit)
- if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
- if(CUDAToolkit_VERSION_MAJOR GREATER 10)
- set(CMAKE_CUDA_ARCHITECTURES 60 70 80)
- else()
- set(CMAKE_CUDA_ARCHITECTURES 60 70)
- endif()
+ if(CUDAToolkit_VERSION_MAJOR GREATER 10)
+ set(CMAKE_CUDA_ARCHITECTURES 60 70 80)
+ else()
+ set(CMAKE_CUDA_ARCHITECTURES 60 70)
endif()
+ # We _still_ need this otherwise CUDA symbols will not be exported
+ # from libarbor.a leading to linker errors when link external clients.
+ # Unit tests are NOT external enough. Re-review this somewhere in the
+ # future.
+ find_package(CUDA ${CUDAToolkit_VERSION_MAJOR} REQUIRED)
elseif(ARB_GPU STREQUAL "cuda-clang")
include(FindCUDAToolkit)
set(ARB_WITH_CUDA_CLANG TRUE)
--
GitLab