summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-18 12:50:34 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-04-18 13:29:19 (GMT)
commit08da8742709d6da74d1a17de46990ec5aaf3ad0f (patch)
tree7708ad99d817b45565f21839db782fb901b296a6
parent3dc4fe02e63422532486320739e0cf4abddaa270 (diff)
downloadCMake-08da8742709d6da74d1a17de46990ec5aaf3ad0f.zip
CMake-08da8742709d6da74d1a17de46990ec5aaf3ad0f.tar.gz
CMake-08da8742709d6da74d1a17de46990ec5aaf3ad0f.tar.bz2
cmMakefile: Split a conditional.
-rw-r--r--Source/cmMakefile.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 029fd3d..5ab1928 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -557,6 +557,10 @@ bool cmMakefile::ReadListFile(const char* filename_in,
this->cmStartDirectory.c_str());
filenametoread = filename_abs.c_str();
}
+ }
+
+ if (external_in)
+ {
external_abs =
cmSystemTools::CollapseFullPath(external_in,
this->cmStartDirectory.c_str());