diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-14 18:49:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-15 12:52:38 (GMT) |
| commit | 401229759c2a738b085b3337babdded645415664 (patch) | |
| tree | 0f165125646dba2f97daf4bb230b14d1d5782baf /Source/cmFindPackageCommand.cxx | |
| parent | 0e7f34c0a9a6ad8dbcdad32910d87b8d8671cd51 (diff) | |
| parent | 02440154fb457e481d44aa0a2c2134e1a66e0f4b (diff) | |
| download | CMake-401229759c2a738b085b3337babdded645415664.zip CMake-401229759c2a738b085b3337babdded645415664.tar.gz CMake-401229759c2a738b085b3337babdded645415664.tar.bz2 | |
Merge branch 'fix-bad-search-ordering' into test-search-ordering
Diffstat (limited to 'Source/cmFindPackageCommand.cxx')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
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(); |