[Cmake-commits] CMake branch, next, updated. v2.8.11-1963-g7c608bf

[Stephen Kelly]

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  7c608bf99e97d63ecde1e48b98be922765322b2b (commit)
       via  46fbdeae8b4ac9b9a38d0db46f86b1663e6cdff6 (commit)
      from  67fa61fd073b2a9fdebd45264a9d293e44fa547e (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=7c608bf99e97d63ecde1e48b98be922765322b2b
commit 7c608bf99e97d63ecde1e48b98be922765322b2b
Merge: 67fa61f 46fbdea
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 13:16:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 13:16:16 2013 -0400

    Merge topic 'fix-sublime-source-flags' into next
    
    46fbdea Make the code match the comment


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46fbdeae8b4ac9b9a38d0db46f86b1663e6cdff6
commit 46fbdeae8b4ac9b9a38d0db46f86b1663e6cdff6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 18:58:58 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 16 19:15:08 2013 +0200

    Make the code match the comment

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index e4802d5..62e9194 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -457,7 +457,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
     }
 
   // Add source file specific flags.
-  lg->AppendFlags(flags, target->GetProperty("COMPILE_FLAGS"));
+  lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
 
   // TODO: Handle Apple frameworks.
 

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

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


hooks/post-receive
-- 
CMake