diff options
| author | David Cole <david.cole@kitware.com> | 2011-02-09 16:42:34 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-02-09 18:01:31 (GMT) |
| commit | fbca267331b1d85f92ea27dfcb9490369c56cf77 (patch) | |
| tree | f9cd8e54369752083e64453f570a41a6f32f3ad0 /Source/cmake.cxx | |
| parent | 98b448ee9e1fc12181667c5f7431163097466daf (diff) | |
| download | CMake-fbca267331b1d85f92ea27dfcb9490369c56cf77.zip CMake-fbca267331b1d85f92ea27dfcb9490369c56cf77.tar.gz CMake-fbca267331b1d85f92ea27dfcb9490369c56cf77.tar.bz2 | |
VS: Only use /MANIFEST if hasManifest is true (#11216)
Thanks to Jörg Riedel for the patch.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index bab0aaf..4ade5da 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; |