diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:36 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:29:19 (GMT) |
| commit | 3a8ac2423ef658e87e366a143428835be48bf88f (patch) | |
| tree | a28b05cc8237d94117323ffe74133be1f5e9ed48 | |
| parent | 5947d9b031444b48a7d7a9c70ef02d2333aeabee (diff) | |
| download | CMake-3a8ac2423ef658e87e366a143428835be48bf88f.zip CMake-3a8ac2423ef658e87e366a143428835be48bf88f.tar.gz CMake-3a8ac2423ef658e87e366a143428835be48bf88f.tar.bz2 | |
cmMakefile: Collapse nested conditional.
| -rw-r--r-- | Source/cmMakefile.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 851e407..9a57223 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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()) |