Просмотр исходного кода

Merge topic 'cmake-mt-return-value'

d384b5a cmake: Fix mt return value when hosted on posix (#14605)
Brad King 12 лет назад
Родитель
Сommit
8a891b1ecc
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      Source/cmcmd.cxx

+ 2 - 1
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;
     }