[Cmake-commits] CMake branch, next, updated. v3.3.1-2855-ga3b677d

[Chuck Atkins]

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  a3b677dfcf5062a84dfebf72a5f24da241e00dba (commit)
       via  a79ac02fccd3905b039abba782f24d58746ed985 (commit)
      from  e6cc5a9fff4689e8b0818e0a21f59f65f1ce7fd3 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3b677dfcf5062a84dfebf72a5f24da241e00dba
commit a3b677dfcf5062a84dfebf72a5f24da241e00dba
Merge: e6cc5a9 a79ac02
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Sep 11 08:48:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 11 08:48:14 2015 -0400

    Merge topic 'fix-bad-search-ordering' into next
    
    a79ac02f find_* : Fix a bug in search path ordering from dd89506c


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a79ac02fccd3905b039abba782f24d58746ed985
commit a79ac02fccd3905b039abba782f24d58746ed985
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Sep 9 16:03:04 2015 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Wed Sep 9 16:03:04 2015 -0400

    find_* : Fix a bug in search path ordering from dd89506c
    
    With a refactoring of how the search paths were stored for the find_*
    commands, a bug was introduced that filters out duplicate paths in an
    incorrect order.  This commit restores the search path to it's
    documented order, now even when path duplicates are present.

diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 7959ffe..fa9b381 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -207,6 +207,10 @@ void cmFindBase::ExpandPaths()
       {
       this->FillCMakeEnvironmentPath();
       }
+    }
+  this->FillUserHintsPath();
+  if(!this->NoDefaultPath)
+    {
     if(!this->NoSystemEnvironmentPath)
       {
       this->FillSystemEnvironmentPath();
@@ -216,8 +220,6 @@ void cmFindBase::ExpandPaths()
       this->FillCMakeSystemVariablePath();
       }
     }
-
-  this->FillUserHintsPath();
   this->FillUserGuessPath();
 }
 
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 9b9071d..64176e7 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1133,6 +1133,10 @@ void cmFindPackageCommand::ComputePrefixes()
       {
       this->FillPrefixesCMakeEnvironment();
       }
+    }
+  this->FillPrefixesUserHints();
+  if(!this->NoDefaultPath)
+    {
     if(!this->NoSystemEnvironmentPath)
       {
       this->FillPrefixesSystemEnvironment();
@@ -1150,7 +1154,6 @@ void cmFindPackageCommand::ComputePrefixes()
       this->FillPrefixesSystemRegistry();
       }
     }
-  this->FillPrefixesUserHints();
   this->FillPrefixesUserGuess();
 
   this->ComputeFinalPaths();

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

Summary of changes:
 Source/cmFindBase.cxx           |    6 ++++--
 Source/cmFindPackageCommand.cxx |    5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake