[Cmake-commits] CMake branch, next, updated. v2.8.11-2091-gf0bf01b

[Brad King]

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  f0bf01b2a6b6eafb89ef93f6a6ecc5984fb743aa (commit)
       via  8e947670cf2af581fb7b97f040e687aa6a2404e0 (commit)
      from  7ca7b0149c4fd83bd4c3676ed3bd1f5a0e63db36 (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=f0bf01b2a6b6eafb89ef93f6a6ecc5984fb743aa
commit f0bf01b2a6b6eafb89ef93f6a6ecc5984fb743aa
Merge: 7ca7b01 8e94767
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 21 14:44:26 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 21 14:44:26 2013 -0400

    Merge topic 'fix-sublime-source-flags' into next
    
    8e94767 Sublime: Honor source-level COMPILE_FLAGS property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e947670cf2af581fb7b97f040e687aa6a2404e0
commit 8e947670cf2af581fb7b97f040e687aa6a2404e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 18:58:58 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 21 14:42:14 2013 -0400

    Sublime: Honor source-level COMPILE_FLAGS property
    
    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:


hooks/post-receive
-- 
CMake