Commit 17e13f0a authored by Stephen Kelly's avatar Stephen Kelly
Browse files

cmMakefile: Simplify CMP0000 handling.

parent d3bb5da9
......@@ -519,8 +519,10 @@ bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
{
this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
std::string curSrc = this->GetCurrentSourceDirectory();
return this->ReadListFile(listfile, true,
curSrc == this->GetHomeDirectory());
bool result = this->ReadListFile(listfile, true,
curSrc == this->GetHomeDirectory());
this->EnforceDirectoryLevelRules();
return result;
}
bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
......@@ -619,13 +621,6 @@ bool cmMakefile::ReadListFileInternal(const char* filenametoread,
}
}
// If this is the directory-level CMakeLists.txt file then perform
// some extra checks.
if(this->ListFileStack.size() == 1)
{
this->EnforceDirectoryLevelRules();
}
return true;
}
......
Supports Markdown
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