cmMakefile: Simplify CMP0000 handling.
This commit is contained in:
parent
d3bb5da929
commit
17e13f0a2d
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue