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

cmMakefile: Re-order independent variable setting.

Browse Source
This commit is contained in:
Stephen Kelly 2015-04-18 14:50:34 +02:00
parent e4f8f1f1b7
commit 3dc4fe02e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmMakefile.cxx
View File

@ -550,10 +550,6 @@ bool cmMakefile::ReadListFile(const char* filename_in,
if (external_in) if (external_in)
{ {
external_abs =
cmSystemTools::CollapseFullPath(external_in,
this->cmStartDirectory.c_str());
external = external_abs.c_str();
if (filename_in) if (filename_in)
{ {
filename_abs = filename_abs =
@ -561,6 +557,10 @@ bool cmMakefile::ReadListFile(const char* filename_in,
this->cmStartDirectory.c_str()); this->cmStartDirectory.c_str());
filenametoread = filename_abs.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 // keep track of the current file being read