diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-15 13:22:07 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-16 09:19:28 -0400 |
| commit | eb35d8884b4cf9f4f96482b1bf6017511fdcdda3 (patch) | |
| tree | 2634d94df58551aa9b7c46586d0102e5176033a7 /Source/cmFindCommon.cxx | |
| parent | 018946aaafc9ada6852d55cb8034faf0f4c1afbc (diff) | |
| download | cmake-eb35d8884b4cf9f4f96482b1bf6017511fdcdda3.tar.gz | |
find_package: Use PackageName_ROOT variables as search prefixes
This feature was originally added by commit v3.9.0-rc1~71^2~2 (find_*:
Add a new PackageRoot search path group, 2017-05-03) and documented by
commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search path
group, 2017-05-03). However, we had to disable the feature and remove
the documentation in commit v3.9.1~2^2 (find_*: Disable the PACKAGE_ROOT
search path group for CMake 3.9, 2017-08-08) due to breaking projects
that used `PackageName_ROOT` variables themselves.
Add policy `CMP0074` to restore the `PackageName_ROOT` variable behavior
in a compatible way. Also revise the stack of root paths to store the
paths themselves rather than the package names. This way the policy can
be considered at the `find_package` call site instead of individual
`find_` calls inside a find module.
Co-Author: Chuck Atkins <chuck.atkins@kitware.com>
Issue: #17144
Diffstat (limited to 'Source/cmFindCommon.cxx')
| -rw-r--r-- | Source/cmFindCommon.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 4a467f384c..64108d7324 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -88,13 +88,6 @@ void cmFindCommon::InitializeSearchPathGroups() std::make_pair(PathLabel::Guess, cmSearchPath(this))); } -void cmFindCommon::SelectDefaultNoPackageRootPath() -{ - if (!this->Makefile->IsOn("__UNDOCUMENTED_CMAKE_FIND_PACKAGE_ROOT")) { - this->NoPackageRootPath = true; - } -} - void cmFindCommon::SelectDefaultRootPathMode() { // Check the policy variable for this find command type. |