kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-bad-search-ordering' into test-search-ordering

This commit is contained in:
Brad King 2015-09-14 14:49:37 -04:00
parent 0e7f34c0a9 02440154fb
commit 401229759c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmFindBase.cxx
View File

@ -207,6 +207,10 @@ void cmFindBase::ExpandPaths()
{ {
this->FillCMakeEnvironmentPath(); this->FillCMakeEnvironmentPath();
} }
}
this->FillUserHintsPath();
if(!this->NoDefaultPath)
{
if(!this->NoSystemEnvironmentPath) if(!this->NoSystemEnvironmentPath)
{ {
this->FillSystemEnvironmentPath(); this->FillSystemEnvironmentPath();
@ -216,8 +220,6 @@ void cmFindBase::ExpandPaths()
this->FillCMakeSystemVariablePath(); this->FillCMakeSystemVariablePath();
} }
} }
this->FillUserHintsPath();
this->FillUserGuessPath(); this->FillUserGuessPath();
} }

5
Source/cmFindPackageCommand.cxx
View File

@ -1133,6 +1133,10 @@ void cmFindPackageCommand::ComputePrefixes()
{ {
this->FillPrefixesCMakeEnvironment(); this->FillPrefixesCMakeEnvironment();
} }
}
this->FillPrefixesUserHints();
if(!this->NoDefaultPath)
{
if(!this->NoSystemEnvironmentPath) if(!this->NoSystemEnvironmentPath)
{ {
this->FillPrefixesSystemEnvironment(); this->FillPrefixesSystemEnvironment();
@ -1150,7 +1154,6 @@ void cmFindPackageCommand::ComputePrefixes()
this->FillPrefixesSystemRegistry(); this->FillPrefixesSystemRegistry();
} }
} }
this->FillPrefixesUserHints();
this->FillPrefixesUserGuess(); this->FillPrefixesUserGuess();
this->ComputeFinalPaths(); this->ComputeFinalPaths();