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

cmMakefile: Collapse nested conditional.

This commit is contained in:
Stephen Kelly 2015-04-18 14:50:36 +02:00
parent 5947d9b031
commit 3a8ac2423e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmMakefile.cxx
View File

@ -548,14 +548,11 @@ bool cmMakefile::ReadListFile(const char* filename_in,
filenametoread = filename_in;
}
if (external_in)
if (external_in && filename_in)
{
if (filename_in)
{
filenametoread =
cmSystemTools::CollapseFullPath(filename_in,
this->cmStartDirectory.c_str());
}
filenametoread =
cmSystemTools::CollapseFullPath(filename_in,
this->cmStartDirectory.c_str());
}
if (!filenametoread.empty())