From 3a8ac2423ef658e87e366a143428835be48bf88f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 18 Apr 2015 14:50:36 +0200 Subject: cmMakefile: Collapse nested conditional. --- Source/cmMakefile.cxx | 11 ++++------- 1 file 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()) -- cgit v0.12