[Cmake-commits] CMake branch, next, updated. v3.6.0-767-gb7f5b9a

[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  b7f5b9abc529c6de5848106a49f0625ae1218f2f (commit)
       via  54475018ae3ea04558b5372bc270e7c08af723f4 (commit)
      from  dd87ef3f66520d6704f99c0bd145d55811603fb5 (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=b7f5b9abc529c6de5848106a49f0625ae1218f2f
commit b7f5b9abc529c6de5848106a49f0625ae1218f2f
Merge: dd87ef3 5447501
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 11 10:31:27 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 11 10:31:27 2016 -0400

    Merge topic 'find-command-restore-PATH-on-unix' into next
    
    54475018 Restore find_(library|file|path) search of PATH itself


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54475018ae3ea04558b5372bc270e7c08af723f4
commit 54475018ae3ea04558b5372bc270e7c08af723f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 11 10:21:38 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 11 10:27:27 2016 -0400

    Restore find_(library|file|path) search of PATH itself
    
    The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library|file|path)
    prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped
    search of the entries in PATH itself in addition to the prefixes derived
    from it.  This regresses find modules that (incorrectly) depended on the
    behavior, including some of our own modules such as FindImageMagick.
    
    Restore the search of entries in PATH itself.  If we want to drop it
    later we will need to do so with a policy.  Fixes #16192.

diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 082bbf0..c785e6c 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -226,12 +226,10 @@ void cmFindBase::FillSystemEnvironmentPath()
     paths.AddEnvPath(this->EnvironmentPath);
 #if defined(_WIN32) || defined(__CYGWIN__)
     paths.AddEnvPrefixPath("PATH", true);
-    paths.AddEnvPath("PATH");
 #endif
-  } else {
-    // Add PATH
-    paths.AddEnvPath("PATH");
   }
+  // Add PATH
+  paths.AddEnvPath("PATH");
   paths.AddSuffixes(this->SearchPathSuffixes);
 }
 

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

Summary of changes:
 Source/cmFindBase.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake