[Cmake-commits] CMake branch, next, updated. v3.3.1-2912-g53ec406

[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  53ec40614e8a0e638a9ef83f6b859fe4ec46c0b7 (commit)
       via  ec8e5fb3af5a24712dc3d4948de88cd4fda83cab (commit)
      from  a01af51341752f994023d73559d45fd12f02c652 (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=53ec40614e8a0e638a9ef83f6b859fe4ec46c0b7
commit 53ec40614e8a0e638a9ef83f6b859fe4ec46c0b7
Merge: a01af51 ec8e5fb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 14 10:50:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 14 10:50:29 2015 -0400

    Merge topic 'fix-bad-search-ordering' into next
    
    ec8e5fb3 find_*: Fix search order when the environment duplicates some HINTS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec8e5fb3af5a24712dc3d4948de88cd4fda83cab
commit ec8e5fb3af5a24712dc3d4948de88cd4fda83cab
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Sep 9 16:03:04 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 14 10:46:44 2015 -0400

    find_*: Fix search order when the environment duplicates some HINTS
    
    Refactoring in the topic merged by commit v3.2.0-rc1~400 (Merge topic
    'refactor-search-path-construction', 2014-11-13) introduced a bug that
    filters out duplicate paths in an incorrect order.  Restore the search
    path to its documented order even when duplicate paths are present.
    
    Reported-by: Marc CHEVRIER <marc.chevrier at sap.com>

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:


hooks/post-receive
-- 
CMake