[Cmake-commits] CMake branch, next, updated. v2.8.9-218-g4366694

[Peter Kuemmel]

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  436669410b23a9c344f67b44e633e3225d1e8d9e (commit)
       via  439f025543beb736dd3aa9f84e0d05a1e420a58e (commit)
       via  8f996a96f40197801fc627ba22d4745861baaeb9 (commit)
      from  9a8e9bf0a1e828fe75b58ba62eebb7e0244f57c3 (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=436669410b23a9c344f67b44e633e3225d1e8d9e
commit 436669410b23a9c344f67b44e633e3225d1e8d9e
Merge: 9a8e9bf 439f025
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Aug 21 18:13:04 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 21 18:13:04 2012 -0400

    Merge topic 'ninja-rc-without-compile-flags' into next
    
    439f025 Ninja: BUG 13486, don't pass COMPILE_FLAGS to rc
    8f996a9 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=439f025543beb736dd3aa9f84e0d05a1e420a58e
commit 439f025543beb736dd3aa9f84e0d05a1e420a58e
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Aug 22 00:11:17 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Wed Aug 22 00:11:17 2012 +0200

    Ninja: BUG 13486, don't pass COMPILE_FLAGS to rc

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b6bdfdc..ee163de 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -167,11 +167,14 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source,
   // Append old-style preprocessor definition flags.
   this->LocalGenerator->AppendFlags(flags, this->Makefile->GetDefineFlags());
 
-  // Add target-specific and source-specific flags.
-  this->LocalGenerator->AppendFlags(flags,
-                                   this->Target->GetProperty("COMPILE_FLAGS"));
-  this->LocalGenerator->AppendFlags(flags,
-                                    source->GetProperty("COMPILE_FLAGS"));
+  if (language != "RC")
+    {
+    // Add target-specific and source-specific flags.
+    this->LocalGenerator->AppendFlags(flags,
+                            this->Target->GetProperty("COMPILE_FLAGS"));
+    this->LocalGenerator->AppendFlags(flags,
+                                  source->GetProperty("COMPILE_FLAGS"));
+    }
 
   // TODO: Handle Apple frameworks.
 

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmNinjaTargetGenerator.cxx |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake