diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-04 19:53:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-04 19:53:45 (GMT) |
| commit | 2654a2e999c1271c6730c1fb7d4582a3fff47ee8 (patch) | |
| tree | b6db51fa75aeb4f42bac93cfd9518978a9ec1190 | |
| parent | 96679969230112d52b6061d6d7523c7c24893255 (diff) | |
| parent | f4eebeb447e628aac3d1f79b780bc309e2ad5904 (diff) | |
| download | CMake-2654a2e999c1271c6730c1fb7d4582a3fff47ee8.zip CMake-2654a2e999c1271c6730c1fb7d4582a3fff47ee8.tar.gz CMake-2654a2e999c1271c6730c1fb7d4582a3fff47ee8.tar.bz2 | |
Merge topic 'FindCUDA-find-nvcc'
f4eebeb447 FindCUDA: Revert "Use find_program instead of find_path to find nvcc"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3991
| -rw-r--r-- | Modules/FindCUDA.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 79d7fda..b6859aa 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -676,7 +676,7 @@ endif() # Search for the cuda distribution. if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING) # Search in the CUDA_BIN_PATH first. - find_program(CUDA_TOOLKIT_ROOT_DIR + find_path(CUDA_TOOLKIT_ROOT_DIR NAMES nvcc nvcc.exe PATHS ENV CUDA_TOOLKIT_ROOT @@ -688,7 +688,7 @@ if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING) ) # Now search default paths - find_program(CUDA_TOOLKIT_ROOT_DIR + find_path(CUDA_TOOLKIT_ROOT_DIR NAMES nvcc nvcc.exe PATHS /opt/cuda/bin PATH_SUFFIXES cuda/bin |