[Cmake-commits] CMake branch, next, updated. v2.8.8-2875-gf40b8e5

[Peter Collingbourne]

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  f40b8e5aa3e58d5bda103f220da21360354fc9a7 (commit)
       via  d807aab28fd86586e8ecb5e4f4d35b43bc68d5f8 (commit)
       via  e78483c08e1f7753509afa4d4aab94274cd6b861 (commit)
       via  0977250ba0dabbefc6eab5a7bf18bd6b4a04258f (commit)
      from  37487c1f29dd8f2d924711708b0bd28cd5e7f26d (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=f40b8e5aa3e58d5bda103f220da21360354fc9a7
commit f40b8e5aa3e58d5bda103f220da21360354fc9a7
Merge: 37487c1 d807aab
Author:     Peter Collingbourne <peter at pcc.me.uk>
AuthorDate: Wed May 16 18:09:46 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 16 18:09:46 2012 -0400

    Merge topic 'ninja-issue-13069' into next
    
    d807aab Ninja: apply CMAKE_<LANG>_FLAGS_<TYPE> to executable targets (#13069)
    e78483c CMake Nightly Date Stamp
    0977250 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d807aab28fd86586e8ecb5e4f4d35b43bc68d5f8
commit d807aab28fd86586e8ecb5e4f4d35b43bc68d5f8
Author:     Peter Collingbourne <peter at pcc.me.uk>
AuthorDate: Mon Apr 30 04:25:37 2012 +0100
Commit:     Peter Collingbourne <peter at pcc.me.uk>
CommitDate: Wed May 16 22:56:42 2012 +0100

    Ninja: apply CMAKE_<LANG>_FLAGS_<TYPE> to executable targets (#13069)
    
    Based on a patch by Zaheer Chothia!

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6362d80..8265d72 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1548,13 +1548,10 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
            target.GetName());
         return;
         }
-      std::string langVar = "CMAKE_";
-      langVar += linkLanguage;
-      std::string flagsVar = langVar + "_FLAGS";
+      this->AddLanguageFlags(flags, linkLanguage, buildType.c_str());
       std::string sharedFlagsVar = "CMAKE_SHARED_LIBRARY_";
       sharedFlagsVar += linkLanguage;
       sharedFlagsVar += "_FLAGS";
-      flags += this->Makefile->GetSafeDefinition(flagsVar.c_str());
       flags += " ";
       flags += this->Makefile->GetSafeDefinition(sharedFlagsVar.c_str());
       flags += " ";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 63ba58d..8b86a98 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -193,12 +193,13 @@ cmNinjaNormalTargetGenerator
     vars.LinkFlags = "$LINK_FLAGS";
 
     std::string langFlags;
-    this->GetLocalGenerator()->AddLanguageFlags(langFlags,
-                                                this->TargetLinkLanguage,
-                                                this->GetConfigName());
-    if (targetType != cmTarget::EXECUTABLE)
+    if (targetType != cmTarget::EXECUTABLE) {
+      this->GetLocalGenerator()->AddLanguageFlags(langFlags,
+                                                  this->TargetLinkLanguage,
+                                                  this->GetConfigName());
       langFlags += " $ARCH_FLAGS";
-    vars.LanguageCompileFlags = langFlags.c_str();
+      vars.LanguageCompileFlags = langFlags.c_str();
+    }
 
     // Rule for linking library.
     std::vector<std::string> linkCmds = this->ComputeLinkCmd();

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

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


hooks/post-receive
-- 
CMake