Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit d602a3db authored by Brad King's avatar Brad King

BUG: Enforce matching policy PUSH/POP in all files

The documentation of cmake_policy PUSH and POP states that they must
always match.  Previously we enforced this only for the top scope of
each CMakeLists.txt file.  This enforces the requirement for all files.
parent 40366f6c
......@@ -562,6 +562,11 @@ bool cmMakefile::ReadListFile(const char* filename_in,
// add this list file to the list of dependencies
this->ListFiles.push_back( filenametoread);
bool endScopeNicely = true;
// Save the current policy stack depth.
size_t const policy_depth = this->PolicyStack.size();
// Run the parsed commands.
const size_t numberFunctions = cacheFile.Functions.size();
for(size_t i =0; i < numberFunctions; ++i)
{
......@@ -576,6 +581,17 @@ bool cmMakefile::ReadListFile(const char* filename_in,
}
}
// Restore policy stack depth.
while(this->PolicyStack.size() > policy_depth)
{
if(endScopeNicely)
{
this->IssueMessage(cmake::FATAL_ERROR,
"cmake_policy PUSH without matching POP");
}
this->PopPolicy(false);
}
// send scope ended to and function blockers
if (endScopeNicely)
{
......@@ -597,7 +613,7 @@ bool cmMakefile::ReadListFile(const char* filename_in,
// some extra checks.
if(this->ListFileStack.size() == 1)
{
this->EnforceDirectoryLevelRules(endScopeNicely);
this->EnforceDirectoryLevelRules();
}
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
......@@ -610,19 +626,8 @@ bool cmMakefile::ReadListFile(const char* filename_in,
}
//----------------------------------------------------------------------------
void cmMakefile::EnforceDirectoryLevelRules(bool endScopeNicely)
void cmMakefile::EnforceDirectoryLevelRules()
{
// Enforce policy stack depth.
while(this->PolicyStack.size() > 1)
{
if(endScopeNicely)
{
this->IssueMessage(cmake::FATAL_ERROR,
"cmake_policy PUSH without matching POP");
}
this->PopPolicy(false);
}
// Diagnose a violation of CMP0000 if necessary.
if(this->CheckCMP0000)
{
......
......@@ -918,7 +918,7 @@ private:
bool CheckCMP0000;
// Enforce rules about CMakeLists.txt files.
void EnforceDirectoryLevelRules(bool endScopeNicely);
void EnforceDirectoryLevelRules();
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment