diff options
| author | Brad King <brad.king@kitware.com> | 2011-02-22 19:31:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-02-22 19:31:55 (GMT) |
| commit | cc5bbed52a73e8381ae682c171f6b314f8f9f6d5 (patch) | |
| tree | 3745d5a4f96e73b681feb9470385482709e49423 /Source/cmake.cxx | |
| parent | 15ff343d23c7c424bc56fd1f156869d8d00e3c34 (diff) | |
| parent | fbca267331b1d85f92ea27dfcb9490369c56cf77 (diff) | |
| download | CMake-cc5bbed52a73e8381ae682c171f6b314f8f9f6d5.zip CMake-cc5bbed52a73e8381ae682c171f6b314f8f9f6d5.tar.gz CMake-cc5bbed52a73e8381ae682c171f6b314f8f9f6d5.tar.bz2 | |
Merge topic 'fix-10704-manifest-no-vs10'
fbca267 VS: Only use /MANIFEST if hasManifest is true (#11216)
98b448e VS2010: Fixed GenerateManifest flag (#10704)
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 0c03b65..81324b6 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -4134,7 +4134,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; |