浏览代码

CUDA: Add support for finding nvcc in CUDA_PATH

Previously, nvcc needed to be present in PATH or specified by CUDACXX.
On Windows with vcpkg, the PATH is heavily modified, which lead to
nvcc not being found with the Ninja generator.
Tobias Ribizel 4 年之前
父节点
当前提交
55233eee42
共有 2 个文件被更改,包括 12 次插入0 次删除
  1. 2 0
      Modules/CMakeDetermineCUDACompiler.cmake
  2. 10 0
      Modules/CMakeDetermineCompiler.cmake

+ 2 - 0
Modules/CMakeDetermineCUDACompiler.cmake

@@ -31,7 +31,9 @@ else()
       set(CMAKE_CUDA_COMPILER_LIST nvcc)
     endif()
 
+    set(_CMAKE_CUDA_COMPILER_PATHS "$ENV{CUDA_PATH}/bin")
     _cmake_find_compiler(CUDA)
+    unset(_CMAKE_CUDA_COMPILER_PATHS)
   else()
     _cmake_find_compiler_path(CUDA)
   endif()

+ 10 - 0
Modules/CMakeDetermineCompiler.cmake

@@ -68,6 +68,16 @@ macro(_cmake_find_compiler lang)
       )
   endif()
   find_program(CMAKE_${lang}_COMPILER NAMES ${CMAKE_${lang}_COMPILER_LIST} DOC "${lang} compiler")
+  if(_CMAKE_${lang}_COMPILER_PATHS)
+    # As a last fall-back, search in language-specific paths
+    find_program(CMAKE_${lang}_COMPILER
+      NAMES ${CMAKE_${lang}_COMPILER_LIST}
+      NAMES_PER_DIR
+      PATHS ${_CMAKE_${lang}_COMPILER_PATHS}
+      DOC "${lang} compiler"
+      NO_DEFAULT_PATH
+      )
+  endif()
   if(CMAKE_${lang}_COMPILER_INIT AND NOT CMAKE_${lang}_COMPILER)
     set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE "${CMAKE_${lang}_COMPILER_INIT}")
   endif()