kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Simplify CMP0000 handling.

This commit is contained in:
Stephen Kelly 2015-05-23 10:50:19 +02:00
parent d3bb5da929
commit 17e13f0a2d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmMakefile.cxx
View File

@ -519,8 +519,10 @@ bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
{ {
this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile); this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
std::string curSrc = this->GetCurrentSourceDirectory(); std::string curSrc = this->GetCurrentSourceDirectory();
return this->ReadListFile(listfile, true, bool result = this->ReadListFile(listfile, true,
curSrc == this->GetHomeDirectory()); curSrc == this->GetHomeDirectory());
this->EnforceDirectoryLevelRules();
return result;
} }
bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope) 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; return true;
} }