mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-25 07:58:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fix_ninja_windows_cuda'

Browse Source 
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
This commit is contained in:
Brad King
2021-03-17 13:24:17 +00:00
committed by Kitware Robot
parent 649976e9a6 55233eee42
commit 1dd62df37e
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeDetermineCUDACompiler.cmake
View File

@@ -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
Modules/CMakeDetermineCompiler.cmake
View File

@@ -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()