[Cmake-commits] CMake branch, next, updated. v2.8.7-3161-gd6e133d

Brad King brad.king at kitware.com
Tue Mar 13 11:21:31 EDT 2012


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  d6e133dc50ce81ac981bfec0213dc9d202643412 (commit)
       via  e3206ad19ef26d7112e51913da2427ac8953e3e3 (commit)
      from  7ff1fbaafefc4c9caa1f09baa2f580cb4950d439 (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=d6e133dc50ce81ac981bfec0213dc9d202643412
commit d6e133dc50ce81ac981bfec0213dc9d202643412
Merge: 7ff1fba e3206ad
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 13 11:21:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 13 11:21:28 2012 -0400

    Merge topic 'ninja-generator' into next
    
    e3206ad add /DEF: flag to linker call


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3206ad19ef26d7112e51913da2427ac8953e3e3
commit e3206ad19ef26d7112e51913da2427ac8953e3e3
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Mar 10 12:19:18 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 13 11:20:29 2012 -0400

    add /DEF: flag to linker call

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 9e05b4c..af7bcd6 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -341,6 +341,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                             vars["LINK_FLAGS"],
                                             *this->GetTarget());
 
+  this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
+
   // Compute architecture specific link flags.  Yes, these go into a different
   // variable for executables, probably due to a mistake made when duplicating
   // code between the Makefile executable and library generators.

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list