Merge branch 'fix-bad-search-ordering' into release
This commit is contained in:
commit
3552a0b9b1
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue