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

cmLocalGenerator: Inline ReadListFile method.

This commit is contained in:
Stephen Kelly 2015-05-19 23:09:46 +02:00 committed by Brad King
parent ad70681909
commit 4080ca497e
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmLocalGenerator.cxx
View File

@ -115,8 +115,10 @@ void cmLocalGenerator::Configure()
filesDir += cmake::GetCMakeFilesDirectory(); filesDir += cmake::GetCMakeFilesDirectory();
cmSystemTools::MakeDirectory(filesDir.c_str()); cmSystemTools::MakeDirectory(filesDir.c_str());
// find & read the list file std::string currentStart = this->StateSnapshot.GetCurrentSourceDirectory();
this->ReadInputFile(); currentStart += "/CMakeLists.txt";
assert(cmSystemTools::FileExists(currentStart.c_str(), true));
this->Makefile->ProcessBuildsystemFile(currentStart.c_str());
// at the end of the ReadListFile handle any old style subdirs // at the end of the ReadListFile handle any old style subdirs
// first get all the subdirectories // first get all the subdirectories
@ -183,16 +185,6 @@ void cmLocalGenerator::ComputeObjectMaxPath()
this->ObjectMaxPathViolations.clear(); this->ObjectMaxPathViolations.clear();
} }
//----------------------------------------------------------------------------
void cmLocalGenerator::ReadInputFile()
{
// Look for the CMakeLists.txt file.
std::string currentStart = this->StateSnapshot.GetCurrentSourceDirectory();
currentStart += "/CMakeLists.txt";
assert(cmSystemTools::FileExists(currentStart.c_str(), true));
this->Makefile->ProcessBuildsystemFile(currentStart.c_str());
}
void cmLocalGenerator::ConfigureFinalPass() void cmLocalGenerator::ConfigureFinalPass()
{ {
this->Makefile->ConfigureFinalPass(); this->Makefile->ConfigureFinalPass();

3
Source/cmLocalGenerator.h
View File

@ -447,9 +447,6 @@ protected:
definition. Issues a warning. */ definition. Issues a warning. */
virtual bool CheckDefinition(std::string const& define) const; virtual bool CheckDefinition(std::string const& define) const;
/** Read the input CMakeLists.txt file. */
void ReadInputFile();
cmMakefile *Makefile; cmMakefile *Makefile;
cmState::Snapshot StateSnapshot; cmState::Snapshot StateSnapshot;
cmGlobalGenerator *GlobalGenerator; cmGlobalGenerator *GlobalGenerator;