diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:34 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:29:19 (GMT) |
| commit | 3dc4fe02e63422532486320739e0cf4abddaa270 (patch) | |
| tree | c7742f99923a634c223a291c5cf74d0c5ae603af | |
| parent | e4f8f1f1b706d7efc9964826ff4572d27a3062d3 (diff) | |
| download | CMake-3dc4fe02e63422532486320739e0cf4abddaa270.zip CMake-3dc4fe02e63422532486320739e0cf4abddaa270.tar.gz CMake-3dc4fe02e63422532486320739e0cf4abddaa270.tar.bz2 | |
cmMakefile: Re-order independent variable setting.
| -rw-r--r-- | Source/cmMakefile.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ac71ea5..029fd3d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -550,10 +550,6 @@ bool cmMakefile::ReadListFile(const char* filename_in, if (external_in) { - external_abs = - cmSystemTools::CollapseFullPath(external_in, - this->cmStartDirectory.c_str()); - external = external_abs.c_str(); if (filename_in) { filename_abs = @@ -561,6 +557,10 @@ bool cmMakefile::ReadListFile(const char* filename_in, this->cmStartDirectory.c_str()); filenametoread = filename_abs.c_str(); } + external_abs = + cmSystemTools::CollapseFullPath(external_in, + this->cmStartDirectory.c_str()); + external = external_abs.c_str(); } // keep track of the current file being read |