diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-18 15:14:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-18 15:14:14 (GMT) |
| commit | e32c903057774ba34de7ed2292b6156f9cf58c5e (patch) | |
| tree | 669d95cf3e5207c922d469c6bc367f349a752235 | |
| parent | daa72b253a5d07b985653c4ce1d2a7a647129e43 (diff) | |
| parent | ca263d1d71d953630e31daa7771dde3c6835b9a2 (diff) | |
| download | CMake-e32c903057774ba34de7ed2292b6156f9cf58c5e.zip CMake-e32c903057774ba34de7ed2292b6156f9cf58c5e.tar.gz CMake-e32c903057774ba34de7ed2292b6156f9cf58c5e.tar.bz2 | |
Merge branch 'fix-ms-manifest-no-linker' into release
| -rw-r--r-- | Source/cmcmd.cxx | 4 | ||||
| -rw-r--r-- | Tests/MSManifest/Subdir/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index f44c77d..a074444 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1550,7 +1550,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()) { @@ -1658,6 +1657,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)) { diff --git a/Tests/MSManifest/Subdir/CMakeLists.txt b/Tests/MSManifest/Subdir/CMakeLists.txt index a47cf00..11272bb 100644 --- a/Tests/MSManifest/Subdir/CMakeLists.txt +++ b/Tests/MSManifest/Subdir/CMakeLists.txt @@ -6,4 +6,6 @@ if(MSVC AND NOT MSVC_VERSION LESS 1400) COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:MSManifest> -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake ) + add_executable(MSManifestNone main.c) + set_property(TARGET MSManifestNone PROPERTY LINK_FLAGS "/MANIFEST:NO") endif() |