diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-19 14:10:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-19 14:10:23 (GMT) |
| commit | 65b9d1f228efb1d028c3682ec5637f431cbc3fc5 (patch) | |
| tree | b2c6885962c03dfc1426dea3dd731a51a96e8a2d /Source/cmcmd.cxx | |
| parent | 4e333e3b32ba2b19b5fb07b9764264add34984b7 (diff) | |
| parent | ca263d1d71d953630e31daa7771dde3c6835b9a2 (diff) | |
| download | CMake-65b9d1f228efb1d028c3682ec5637f431cbc3fc5.zip CMake-65b9d1f228efb1d028c3682ec5637f431cbc3fc5.tar.gz CMake-65b9d1f228efb1d028c3682ec5637f431cbc3fc5.tar.bz2 | |
Merge topic 'fix-ms-manifest-no-linker'
ca263d1d MSVC: Fix linking with /MANIFEST:NO option
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 54a1590..21b126b 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1555,7 +1555,6 @@ bool cmVSLink::Parse(std::vector<std::string>::const_iterator argBeg, // pass it to the link command. this->ManifestFileRC = intDir + "/manifest.rc"; this->ManifestFileRes = intDir + "/manifest.res"; - this->LinkCommand.push_back(this->ManifestFileRes); } else if (this->UserManifests.empty()) { @@ -1663,6 +1662,9 @@ int cmVSLink::LinkIncremental() return -1; } + // Tell the linker to use our manifest compiled into a resource. + this->LinkCommand.push_back(this->ManifestFileRes); + // Run the link command (possibly generates intermediate manifest). if (!RunCommand("LINK Pass 1", this->LinkCommand, this->Verbose)) { |