diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-17 13:24:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-17 13:24:45 (GMT) |
| commit | 1dd62df37ec0ff9afb76e1b540e7632221031aab (patch) | |
| tree | 7ef93d078955bc5e0d096f9fce4a0f9a2de2880f /Modules | |
| parent | 649976e9a656e4c98bd235f7232b2f46d78da31a (diff) | |
| parent | 55233eee424816843bb0a5c820d3d4ebbdf3da27 (diff) | |
| download | CMake-1dd62df37ec0ff9afb76e1b540e7632221031aab.zip CMake-1dd62df37ec0ff9afb76e1b540e7632221031aab.tar.gz CMake-1dd62df37ec0ff9afb76e1b540e7632221031aab.tar.bz2 | |
Merge topic 'fix_ninja_windows_cuda'
55233eee42 CUDA: Add support for finding nvcc in CUDA_PATH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5908
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCUDACompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCompiler.cmake | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake index 1ba537a..0f507ea 100644 --- a/Modules/CMakeDetermineCUDACompiler.cmake +++ b/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() diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake index 2780399..6430793 100644 --- a/Modules/CMakeDetermineCompiler.cmake +++ b/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() |