[Cmake-commits] CMake branch, next, updated. v3.7.1-1723-g1129ebf

[Brad King]

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, next has been updated
       via  1129ebfc65e412e760a7cb53d07729a8e320b679 (commit)
       via  1d1f29f435cd9854ec6b6075bf3e7dd810d19ec8 (commit)
      from  790ed0f91d04f86963dd20a46edb3f5ff74eb586 (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=1129ebfc65e412e760a7cb53d07729a8e320b679
commit 1129ebfc65e412e760a7cb53d07729a8e320b679
Merge: 790ed0f 1d1f29f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 12 14:28:34 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 12 14:28:34 2016 -0500

    Merge topic 'GetPrerequisites-fix-find_program-call' into next
    
    1d1f29f4 GetPrerequisites: Fix call to find_program for `ri` tool


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d1f29f435cd9854ec6b6075bf3e7dd810d19ec8
commit 1d1f29f435cd9854ec6b6075bf3e7dd810d19ec8
Author:     Martin Koegler <martin.koegler at chello.at>
AuthorDate: Fri Dec 9 21:52:34 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 12 14:27:21 2016 -0500

    GetPrerequisites: Fix call to find_program for `ri` tool
    
    `find_program` does not work with `${a};${b}` as a search path.
    Use separate arguments to `PATHS`.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 5ab9dc5..72775ce 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -430,8 +430,8 @@ function(gp_resolve_item context item exepath dirs resolved_item_var)
   if(WIN32 AND NOT UNIX)
   if(NOT resolved)
     set(ri "ri-NOTFOUND")
-    find_program(ri "${item}" PATHS "${exepath};${dirs}" NO_DEFAULT_PATH)
-    find_program(ri "${item}" PATHS "${exepath};${dirs}")
+    find_program(ri "${item}" PATHS ${exepath} ${dirs} NO_DEFAULT_PATH)
+    find_program(ri "${item}" PATHS ${exepath} ${dirs})
     if(ri)
       #message(STATUS "info: 'find_program' in exepath/dirs (${ri})")
       set(resolved 1)

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

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


hooks/post-receive
-- 
CMake