[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5955-g4ae2506

[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  4ae250616b49637de1d8651fa71612a3971b9e94 (commit)
       via  d384b5aa7bcc4853af1b5993a5054a8c387d1f6a (commit)
      from  3478bd5a6b263e8f0ca7d715205aaf1f4d9422e1 (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=4ae250616b49637de1d8651fa71612a3971b9e94
commit 4ae250616b49637de1d8651fa71612a3971b9e94
Merge: 3478bd5 d384b5a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 2 10:18:59 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 2 10:18:59 2013 -0500

    Merge topic 'cmake-mt-return-value' into next
    
    d384b5a cmake: Fix mt return value when hosted on posix (#14605)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d384b5aa7bcc4853af1b5993a5054a8c387d1f6a
commit d384b5aa7bcc4853af1b5993a5054a8c387d1f6a
Author:     Flynn Marquardt <flynn at geomap.de>
AuthorDate: Mon Dec 2 10:16:34 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 2 10:17:31 2013 -0500

    cmake: Fix mt return value when hosted on posix (#14605)
    
    On posix platforms return values are limited to a range from 0 to 255.
    Cross compiling/linking with MSVC on linux/wine leads to a
    misinterpretation of the return value 1090650113 of mt.exe.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index d4f464c..d3b7b5f 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1294,7 +1294,8 @@ int cmcmd::VisualStudioLinkIncremental(std::vector<std::string>& args,
   // to do the final link.  If mt has any value other than 0 or 1090650113
   // then there was some problem with the command itself and there was an
   // error so return the error code back out of cmake so make can report it.
-  if(mtRet != 1090650113)
+  // (when hosted on a posix system the value is 187)
+  if(mtRet != 1090650113 && mtRet != 187)
     {
     return mtRet;
     }

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

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


hooks/post-receive
-- 
CMake