[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7415-gf10e3b3

[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  f10e3b3c581a6a94e86909ab2678c69d9d383c0f (commit)
       via  ca5c2f46e219e3e3211b0f5310c85fe350138f64 (commit)
      from  dec888b59e550ef6cbe39583b571c4a867c21cda (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=f10e3b3c581a6a94e86909ab2678c69d9d383c0f
commit f10e3b3c581a6a94e86909ab2678c69d9d383c0f
Merge: dec888b ca5c2f4
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 4 13:16:25 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 4 13:16:25 2014 -0500

    Merge topic 'gcc-ipo' into next
    
    ca5c2f46 IPO: the Makefile generator uses IPO flags at link time; Ninja should too


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca5c2f46e219e3e3211b0f5310c85fe350138f64
commit ca5c2f46e219e3e3211b0f5310c85fe350138f64
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 4 19:16:06 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Feb 4 19:16:06 2014 +0100

    IPO: the Makefile generator uses IPO flags at link time; Ninja should too

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 56c8e1b..b979be1 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -489,6 +489,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   std::string flags = (targetType == cmTarget::EXECUTABLE
                                ? vars["FLAGS"]
                                : vars["ARCH_FLAGS"]);
+
+  this->AddFeatureFlags(flags, this->TargetLinkLanguage);
+
   this->GetLocalGenerator()->AddArchitectureFlags(flags,
                              this->GetGeneratorTarget(),
                              this->TargetLinkLanguage,

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake