[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-509-gfe5a2d8

[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  fe5a2d877f809d13961d3c21a3661275257ce2e3 (commit)
       via  eacf7decbf78a184cdad7a6fd533aa4f433ec27f (commit)
      from  5b4f3ea3e7776c6a2c0fb2d9e1c052af8f8a1209 (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=fe5a2d877f809d13961d3c21a3661275257ce2e3
commit fe5a2d877f809d13961d3c21a3661275257ce2e3
Merge: 5b4f3ea eacf7de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 07:50:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 07:50:17 2017 -0500

    Merge topic 'GetPrerequisites-find_item_basename' into next
    
    eacf7dec GetPrerequisites: also try to resolve just the basename


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eacf7decbf78a184cdad7a6fd533aa4f433ec27f
commit eacf7decbf78a184cdad7a6fd533aa4f433ec27f
Author:     Michael Maltese <michaeljosephmaltese at gmail.com>
AuthorDate: Tue Feb 21 22:21:49 2017 -0800
Commit:     Michael Maltese <michaeljosephmaltese at gmail.com>
CommitDate: Wed Feb 22 12:27:39 2017 -0800

    GetPrerequisites: also try to resolve just the basename
    
    Fixes #16625.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 1b23800..417af7c 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -399,6 +399,11 @@ function(gp_resolve_item context item exepath dirs resolved_item_var)
     set(ri "ri-NOTFOUND")
     find_file(ri "${item}" ${exepath} ${dirs} NO_DEFAULT_PATH)
     find_file(ri "${item}" ${exepath} ${dirs} /usr/lib)
+
+    get_filename_component(basename_item "${item}" NAME)
+    find_file(ri "${basename_item}" PATHS ${exepath} ${dirs} NO_DEFAULT_PATH)
+    find_file(ri "${basename_item}" PATHS /usr/lib)
+
     if(ri)
       #message(STATUS "info: 'find_file' in exepath/dirs (${ri})")
       set(resolved 1)

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake