diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-16 05:21:24 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-18 20:06:16 +0200 |
| commit | 333c1fa83bd20f7b1039ab0a90e442b03d2c27e5 (patch) | |
| tree | 73725fbfe278716e70d1dac3d2a223fe182eb655 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | a97df5e13566cc2ccbaf51a395b85b03b363a07f (diff) | |
| download | cmake-333c1fa83bd20f7b1039ab0a90e442b03d2c27e5.tar.gz | |
cmGlobalUnixMakefileGenerator3: Host the UnixCD.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index cb4d8cf43f..1ba6656db1 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -85,7 +85,6 @@ cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg, cmLocalGenerator* parent) { this->MakefileVariableSize = 0; this->IgnoreLibPrefix = false; - this->UnixCD = true; this->ColorMakefile = false; this->SkipPreprocessedSourceRules = false; this->SkipAssemblySourceRules = false; @@ -2347,7 +2346,9 @@ void cmLocalUnixMakefileGenerator3 // support changing the drive letter with just "d:"). const char* cd_cmd = this->IsMinGWMake() ? "cd /d " : "cd "; - if(!this->UnixCD) + cmGlobalUnixMakefileGenerator3* gg = + static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); + if(!gg->UnixCD) { // On Windows we must perform each step separately and then change // back because the shell keeps the working directory between |