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

cmMakefile: Delegate ListFile reading to internal method.

Browse Source
This commit is contained in:
Stephen Kelly 2015-04-18 14:50:32 +02:00
parent 846608f267
commit 0d9555779d
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMakefile.cxx
View File

@ -541,6 +541,15 @@ bool cmMakefile::ReadListFile(const char* filename_in,
const char *external_in, const char *external_in,
bool noPolicyScope, bool noPolicyScope,
bool requireProjectCommand) bool requireProjectCommand)
{
return this->ReadListFileInternal(filename_in, external_in,
noPolicyScope, requireProjectCommand);
}
bool cmMakefile::ReadListFileInternal(const char* filename_in,
const char* external_in,
bool noPolicyScope,
bool requireProjectCommand)
{ {
std::string currentParentFile std::string currentParentFile
= this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE"); = this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE");

6
Source/cmMakefile.h
View File

@ -991,6 +991,12 @@ protected:
private: private:
void Initialize(); void Initialize();
bool ReadListFileInternal(const char* filename_in,
const char* external_in,
bool noPolicyScope,
bool requireProjectCommand);
bool ParseDefineFlag(std::string const& definition, bool remove); bool ParseDefineFlag(std::string const& definition, bool remove);
bool EnforceUniqueDir(const std::string& srcPath, bool EnforceUniqueDir(const std::string& srcPath,