From fbca267331b1d85f92ea27dfcb9490369c56cf77 Mon Sep 17 00:00:00 2001
From: David Cole <david.cole@kitware.com>
Date: Wed, 9 Feb 2011 11:42:34 -0500
Subject: [PATCH] VS: Only use /MANIFEST if hasManifest is true (#11216)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Jörg Riedel for the patch.
---
 Source/cmake.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index bab0aaf834..4ade5da586 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4108,7 +4108,10 @@ int cmake::VisualStudioLinkNonIncremental(std::vector<std::string>& args,
     return -1;
     }
   // Run the link command as given
-  linkCommand.push_back("/MANIFEST");
+  if (hasManifest)
+    {
+    linkCommand.push_back("/MANIFEST");
+    }
   if(!cmake::RunCommand("LINK", linkCommand, verbose))
     {
     return -1;