diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-14 18:47:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-14 18:47:58 (GMT) |
| commit | 3552a0b9b1a0573ef7b8017d85a8741075c2827f (patch) | |
| tree | 19db870e7ddfe244fa81ed477e06a3800431d8f6 | |
| parent | f6336f6cfdc0c7cf1e040f0a84ded5c39e504bfd (diff) | |
| parent | 02440154fb457e481d44aa0a2c2134e1a66e0f4b (diff) | |
| download | CMake-3552a0b9b1a0573ef7b8017d85a8741075c2827f.zip CMake-3552a0b9b1a0573ef7b8017d85a8741075c2827f.tar.gz CMake-3552a0b9b1a0573ef7b8017d85a8741075c2827f.tar.bz2 | |
Merge branch 'fix-bad-search-ordering' into release
| -rw-r--r-- | Source/cmFindBase.cxx | 6 | ||||
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index add06a7..e2f86ce 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 68a6558..bf4033e 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(); |