[Cmake-commits] CMake branch, next, updated. v3.3.0-1468-gad9e76d

[Nils Gladitz]

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  ad9e76d493019ecd30e914960f3df733aa44b786 (commit)
       via  35fb0bb8c09cfc5fd75ad87fac58799e5054b7ce (commit)
       via  9e293194472134d059282f5f3155358315f3e1dc (commit)
      from  3704f34f8a8132d1b4cbe6041bbd7a99494c4481 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad9e76d493019ecd30e914960f3df733aa44b786
commit ad9e76d493019ecd30e914960f3df733aa44b786
Merge: 3704f34 35fb0bb
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 28 09:13:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 28 09:13:43 2015 -0400

    Merge topic 'ninja-implib-byproduct' into next
    
    35fb0bb8 Ninja: Make import libraries BYPRODUCTs instead of regular OUTPUTs
    9e293194 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35fb0bb8c09cfc5fd75ad87fac58799e5054b7ce
commit 35fb0bb8c09cfc5fd75ad87fac58799e5054b7ce
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 28 14:02:47 2015 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Jul 28 14:02:47 2015 +0200

    Ninja: Make import libraries BYPRODUCTs instead of regular OUTPUTs
    
    The MSVC linker may update a binary without touching the associated
    import library.
    
    Making the import library a BYPRODUCT prevents the linker from
    unnecessarily rerunning when the import library does not get regenerated
    as previously expected.

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 88da09b..aabf18c 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -546,6 +546,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       }
     }
 
+  cmNinjaDeps byproducts;
+
   if (!this->TargetNameImport.empty())
     {
     const std::string impLibPath = localGen.ConvertToOutputFormat(
@@ -555,7 +557,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     EnsureParentDirectoryExists(impLibPath);
     if(target.HasImportLibrary())
       {
-      outputs.push_back(targetOutputImplib);
+      byproducts.push_back(targetOutputImplib);
       }
     }
 
@@ -601,7 +603,6 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     &postBuildCmdLines
   };
 
-  cmNinjaDeps byproducts;
   for (unsigned i = 0; i != 3; ++i)
     {
     for (std::vector<cmCustomCommand>::const_iterator

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

Summary of changes:
 Source/CMakeVersion.cmake               |    2 +-
 Source/cmNinjaNormalTargetGenerator.cxx |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake