diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-24 15:54:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-24 15:55:03 (GMT) |
| commit | 156f4c2f80a5aa603d71a24ba78441961bfcfd7d (patch) | |
| tree | c89462cbe5472a308a761014a68b25201c697f87 /Source | |
| parent | 47777942a5b4be182f8e95eb39444a2e55a395a5 (diff) | |
| parent | 609fe39043f37366b50ee5ac0ae283b93af23492 (diff) | |
| download | CMake-156f4c2f80a5aa603d71a24ba78441961bfcfd7d.zip CMake-156f4c2f80a5aa603d71a24ba78441961bfcfd7d.tar.gz CMake-156f4c2f80a5aa603d71a24ba78441961bfcfd7d.tar.bz2 | |
Merge topic 'find_pkg_use_new_global_controls'
609fe39043 FindPackage: Support `NO_[]_PATH` global call options
ff29c92df6 Tests: find_file restore PATH env variable after test runs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3590
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index c6d599e..e4551dd 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -225,6 +225,9 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args, this->SortDirection = strcmp(sd, "ASC") == 0 ? Asc : Dec; } + // Find what search path locations have been enabled/disable + this->SelectDefaultSearchModes(); + // Find the current root path mode. this->SelectDefaultRootPathMode(); |