If no CUDA compiler is found, but the CUDAToolkit is available, use the toolkit's compiler. (#144)

* If no CUDA compiler is found, but the CUDAToolkit is available, use the
toolkit's compiler.
* make sure CUDA architecture is set to default even if toolkit is not found

Author: DeVasconcelos

cmake/CoviseHelperMacros.cmake

@@ -1155,31 +1155,44 @@ MACRO(COVISE_USE_OPENMP target)
 ENDMACRO(COVISE_USE_OPENMP)
 
 MACRO(COVISE_FIND_CUDA)
-   IF(COVISE_USE_CUDA)
-       include(CheckLanguage)
-       check_language(CUDA)
-      covise_find_package(CUDAToolkit)
-   ENDIF(COVISE_USE_CUDA)
-   IF((CMAKE_CUDA_COMPILER OR CUDAToolkit_NVCC_EXECUTABLE) AND CUDAToolkit_FOUND AND COVISE_USE_CUDA)
+  IF(COVISE_USE_CUDA)
+    include(CheckLanguage)
+    check_language(CUDA)
+
+    # If the CUDA toolkit is available, but no CUDA compiler was
+    # found, use the compiler from the toolkit, instead.
+    covise_find_package(CUDAToolkit)
+    if(CUDAToolkit_FOUND)
+     if(CUDAToolkit_NVCC_EXECUTABLE AND NOT CMAKE_CUDA_COMPILER)
+      set(CMAKE_CUDA_COMPILER
+            ${CUDAToolkit_NVCC_EXECUTABLE}
+            CACHE FILEPATH "CUDA compiler" FORCE)
+      endif()
+    endif()
+      
+    if(CMAKE_CUDA_COMPILER)
+      # make sure CUDA architecture is set
+      if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
+        if(CUDAToolkit_VERSION_MAJOR GREATER 12)
+          set(CMAKE_CUDA_ARCHITECTURES 75)
+        else()
+          set(CMAKE_CUDA_ARCHITECTURES 60)
+        endif()
+      endif()
+
       enable_language(CUDA)
       ADD_DEFINITIONS(-DHAVE_CUDA)
       set(CUDA_FOUND TRUE)
       set(CUDA_PROPAGATE_HOST_FLAGS ON)
       if(NOT WIN32)
-          if ((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
-              set(CUDA_NVCC_FLAGS "-g ${CUDA_NVCC_FLAGS}")
-          endif()
+        if ((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+          set(CUDA_NVCC_FLAGS "-g ${CUDA_NVCC_FLAGS}")
+        endif()
       endif()
       covise_find_package(CCCL CONFIG)
-  ENDIF()
+    endif()
 
-  if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-      if(CUDAToolkit_VERSION_MAJOR GREATER 12)
-          set(CMAKE_CUDA_ARCHITECTURES 75)
-      else()
-          set(CMAKE_CUDA_ARCHITECTURES 60)
-      endif()
-  endif()
+  ENDIF(COVISE_USE_CUDA)
 ENDMACRO(COVISE_FIND_CUDA)
 
 MACRO(COVISE_FIND_BOOST)