diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:32 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:29:17 (GMT) |
| commit | a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4 (patch) | |
| tree | dd46c44fb1a2267149352ff1a95b09b72ce737f8 /Source/cmFindPackageCommand.cxx | |
| parent | 68f791cd06983e8fd375edfba74a9d821231e269 (diff) | |
| download | CMake-a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4.zip CMake-a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4.tar.gz CMake-a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4.tar.bz2 | |
cmMakefile: Add wrapper for reading listfiles which have an origin.
Such files are delegates from other files, and so they set the
CMAKE_PARENT_LIST_FILE to the originator. They also may set a
policy scope.
Diffstat (limited to 'Source/cmFindPackageCommand.cxx')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index af99b1c..aecd230 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -999,8 +999,8 @@ bool cmFindPackageCommand::FindAppBundleConfig() //---------------------------------------------------------------------------- bool cmFindPackageCommand::ReadListFile(const char* f, PolicyScopeRule psr) { - if(this->Makefile->ReadListFile(this->Makefile->GetCurrentListFile(), f, - !this->PolicyScope || psr == NoPolicyScope)) + const bool noPolicyScope = !this->PolicyScope || psr == NoPolicyScope; + if(this->Makefile->ReadDependentFile(f, noPolicyScope)) { return true; } |