summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-03 14:30:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-03 14:30:23 (GMT)
commit8a891b1ecc629e57d03abbfdea8e6a52917bf4eb (patch)
treecc6d5342c1cc3ab00e007fe15ea1dde6ec149afd
parentda47c9733bd66b48bb23f4f3782bb61108d2af53 (diff)
parentd384b5aa7bcc4853af1b5993a5054a8c387d1f6a (diff)
downloadCMake-8a891b1ecc629e57d03abbfdea8e6a52917bf4eb.zip
CMake-8a891b1ecc629e57d03abbfdea8e6a52917bf4eb.tar.gz
CMake-8a891b1ecc629e57d03abbfdea8e6a52917bf4eb.tar.bz2
Merge topic 'cmake-mt-return-value'
d384b5a cmake: Fix mt return value when hosted on posix (#14605)
-rw-r--r--Source/cmcmd.cxx3
1 files changed, 2 insertions, 1 deletions
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;
}