diff options
author | Brad King <brad.king@kitware.com> | 2011-04-08 20:12:18 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2011-04-08 20:12:18 (GMT) |
commit | 42a732ba2059255ac82a28fff3240c67955483e0 (patch) | |
tree | 18525ad42646128714a4386f7cac300e5af306ba /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | b5676134ce25df1a60724478d056a95bca106e8f (diff) | |
download | CMake-42a732ba2059255ac82a28fff3240c67955483e0.zip CMake-42a732ba2059255ac82a28fff3240c67955483e0.tar.gz CMake-42a732ba2059255ac82a28fff3240c67955483e0.tar.bz2 |
Change working drive only in MinGW Makefiles
The parent commit assumed that "cd /d" would work in all Windows shells.
While all modern versions of windows have shells that support it, the
shells used by NMake and Borland make do not. Borland make does not
seem to even support changing drive letters with "d:". Just revert the
feature for all make tools except MinGW where the shell is known to
support this feature.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index d42c124..5c2cda1 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -2228,8 +2228,11 @@ void cmLocalUnixMakefileGenerator3 return; } - // In a Windows shell we must change drive letter too. - const char* cd_cmd = this->WindowsShell? "cd /d " : "cd "; + // In a Windows shell we must change drive letter too. The shell + // used by NMake and Borland make does not support "cd /d" so this + // feature simply cannot work with them (Borland make does not even + // support changing the drive letter with just "d:"). + const char* cd_cmd = this->MinGWMake? "cd /d " : "cd "; if(!this->UnixCD) { |