Explorar el Código

VS: Only use /MANIFEST if hasManifest is true (#11216)

Thanks to J�rg Riedel for the patch.
David Cole hace 15 años
padre
commit
fbca267331
Se han modificado 1 ficheros con 4 adiciones y 1 borrados
  1. 4 1
      Source/cmake.cxx

+ 4 - 1
Source/cmake.cxx

@@ -4108,7 +4108,10 @@ int cmake::VisualStudioLinkNonIncremental(std::vector<std::string>& args,
     return -1;
     return -1;
     }
     }
   // Run the link command as given
   // Run the link command as given
-  linkCommand.push_back("/MANIFEST");
+  if (hasManifest)
+    {
+    linkCommand.push_back("/MANIFEST");
+    }
   if(!cmake::RunCommand("LINK", linkCommand, verbose))
   if(!cmake::RunCommand("LINK", linkCommand, verbose))
     {
     {
     return -1;
     return -1;