[Cmake-commits] CMake branch, next, updated. v2.8.9-364-g6b1ccc4

[David Cole]

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  6b1ccc4ad2de5548db2d607a41f944b7acdf7102 (commit)
       via  043ef66c5fa77a46e48f0c1d07b6532e93bbc909 (commit)
      from  e3d033a4451a6d8ce4eed17c46f772a2650b6976 (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=6b1ccc4ad2de5548db2d607a41f944b7acdf7102
commit 6b1ccc4ad2de5548db2d607a41f944b7acdf7102
Merge: e3d033a 043ef66
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Sep 5 07:46:23 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 5 07:46:23 2012 -0400

    Merge topic 'ninja-rc-without-compile-flags' into next
    
    043ef66 Revert "Ninja: BUG 13486, don't pass COMPILE_FLAGS to rc"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=043ef66c5fa77a46e48f0c1d07b6532e93bbc909
commit 043ef66c5fa77a46e48f0c1d07b6532e93bbc909
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Sep 5 07:44:11 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Sep 5 07:44:11 2012 -0400

    Revert "Ninja: BUG 13486, don't pass COMPILE_FLAGS to rc"
    
    This reverts commit 439f025543beb736dd3aa9f84e0d05a1e420a58e.
    
    Plan on using CMAKE_RC_FLAG_REGEX instead of hard-coding it like
    this commit attempted to do. See notes in bug #13486 for more details.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index ee163de..b6bdfdc 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -167,14 +167,11 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source,
   // Append old-style preprocessor definition flags.
   this->LocalGenerator->AppendFlags(flags, this->Makefile->GetDefineFlags());
 
-  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"));
-    }
+  // 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/cmNinjaTargetGenerator.cxx |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake