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

include: Ask for permission, rather than forgiveness.

Browse Source 
Check that a non-optional file exists before attempting to include
it.  This makes more sense than relying on an error case deeper
within cmListFileCache.
This commit is contained in:
Stephen Kelly 2015-04-27 22:10:51 +02:00
parent dd062b2b50
commit 8d9f39f4c3
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmIncludeCommand.cxx
View File

@ -130,8 +130,20 @@ bool cmIncludeCommand
gg->GenerateImportFile(fname_abs); gg->GenerateImportFile(fname_abs);
} }
std::string listFile =
cmSystemTools::CollapseFullPath(fname.c_str(),
this->Makefile->GetCurrentSourceDirectory());
if(optional && !cmSystemTools::FileExists(listFile.c_str()))
{
if (!resultVarName.empty())
{
this->Makefile->AddDefinition(resultVarName, "NOTFOUND");
}
return true;
}
bool readit = bool readit =
this->Makefile->ReadDependentFile(fname.c_str(), noPolicyScope); this->Makefile->ReadDependentFile(listFile.c_str(), noPolicyScope);
// add the location of the included file if a result variable was given // add the location of the included file if a result variable was given
if (!resultVarName.empty()) if (!resultVarName.empty())