[Cmake-commits] CMake branch, next, updated. v3.4.0-1394-ge720b5f

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e720b5f39b594f48e4c0f1b2133e071c63009431 (commit)
       via  ca263d1d71d953630e31daa7771dde3c6835b9a2 (commit)
      from  8913439f0bd4fe8fb314ea86ea8fc6f48511609f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e720b5f39b594f48e4c0f1b2133e071c63009431
commit e720b5f39b594f48e4c0f1b2133e071c63009431
Merge: 8913439 ca263d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 18 09:34:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 18 09:34:52 2015 -0500

    Merge topic 'fix-ms-manifest-no-linker' into next
    
    ca263d1d MSVC: Fix linking with /MANIFEST:NO option


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca263d1d71d953630e31daa7771dde3c6835b9a2
commit ca263d1d71d953630e31daa7771dde3c6835b9a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 18 09:10:51 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 18 09:31:56 2015 -0500

    MSVC: Fix linking with /MANIFEST:NO option
    
    Refactoring in commit v3.4.0-rc1~74^2~1 (MSVC: Rewrite manifest file
    handling with Makefile and Ninja, 2015-09-15) broke handling of this
    option.  Fix it and add a test case.

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()

-----------------------------------------------------------------------

Summary of changes:
 Source/cmcmd.cxx                       |    4 +++-
 Tests/MSManifest/Subdir/CMakeLists.txt |    2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake