[Cmake-commits] CMake branch, next, updated. v2.8.4-1399-gc97d814

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c97d814e780fd79a600934092d185cc73ffa9b24 (commit)
       via  42a732ba2059255ac82a28fff3240c67955483e0 (commit)
      from  854ad62b1debf835ca6101fca4531a801c6098e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c97d814e780fd79a600934092d185cc73ffa9b24
commit c97d814e780fd79a600934092d185cc73ffa9b24
Merge: 854ad62 42a732b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 16:15:20 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 16:15:20 2011 -0400

    Merge topic 'windows-make-working-drive' into next
    
    42a732b Change working drive only in MinGW Makefiles


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42a732ba2059255ac82a28fff3240c67955483e0
commit 42a732ba2059255ac82a28fff3240c67955483e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 16:12:18 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 8 16:12:18 2011 -0400

    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.

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)
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake