mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 22:50:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: speed improvements

Browse Source
This commit is contained in:
Bill Hoffman
2002-04-11 17:02:10 -04:00
parent cdc65cfebf
commit 789267c949
11 changed files with 31 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmIncludeCommand.cxx
View File

@@ -25,19 +25,21 @@ bool cmIncludeCommand::InitialPass(std::vector<std::string> const& args)
this->SetError("called with wrong number of arguments. "
"Include only takes one file.");
}
bool exists = cmSystemTools::FileExists(args[0].c_str());
if(args.size() == 2 && args[1] == "OPTIONAL" && !exists)
bool optional = false;
if(args.size() == 2)
{
return true;
optional = args[1] == "OPTIONAL";
}
if(!exists)
bool readit = m_Makefile->ReadListFile( m_Makefile->GetCurrentListFile(),
args[0].c_str());
if(!optional && !readit)
{
std::string error = "Include file not found: " + args[0] + "\n";
this->SetError(error.c_str());
std::string m = "Could not find include file:";
m += args[0];
this->SetError(m.c_str());
return false;
}
m_Makefile->ReadListFile( m_Makefile->GetCurrentListFile(),
args[0].c_str());
return true;
}