[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-214-g2654a2e999

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2654a2e999c1271c6730c1fb7d4582a3fff47ee8 (commit)
       via  f4eebeb447e628aac3d1f79b780bc309e2ad5904 (commit)
      from  96679969230112d52b6061d6d7523c7c24893255 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2654a2e999c1271c6730c1fb7d4582a3fff47ee8
commit 2654a2e999c1271c6730c1fb7d4582a3fff47ee8
Merge: 9667996923 f4eebeb447
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 19:53:38 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 4 14:53:45 2019 -0500

    Merge topic 'FindCUDA-find-nvcc'
    
    f4eebeb447 FindCUDA: Revert "Use find_program instead of find_path to find nvcc"
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3991


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4eebeb447e628aac3d1f79b780bc309e2ad5904
commit f4eebeb447e628aac3d1f79b780bc309e2ad5904
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 14:49:53 2019 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 14:50:04 2019 -0500

    FindCUDA: Revert "Use find_program instead of find_path to find nvcc"
    
    Revert commit 067ee518f7 (FindCUDA: Use find_program instead of
    find_path to find nvcc, 2019-10-31).  It causes `CUDA_TOOLKIT_ROOT_DIR`
    to contain the path to nvcc rather than the toolkit directory.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 79d7fda653..b6859aaf41 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

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCUDA.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake