[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7632-g74ad0c2

[Ben Boeckel]

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  74ad0c21321e7d2978e2ba07cf2bbbbd91e08a52 (commit)
       via  2d9f93ab24872bebc77be8ac388592ddfaa76e45 (commit)
      from  42f870c733978416e959bd8102ea57855d231632 (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=74ad0c21321e7d2978e2ba07cf2bbbbd91e08a52
commit 74ad0c21321e7d2978e2ba07cf2bbbbd91e08a52
Merge: 42f870c 2d9f93a
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Feb 11 14:42:41 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 11 14:42:41 2014 -0500

    Merge topic 'dev/fix-sublime-compile-flags' into next
    
    2d9f93ab Sublime: Pass language and config properly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d9f93ab24872bebc77be8ac388592ddfaa76e45
commit 2d9f93ab24872bebc77be8ac388592ddfaa76e45
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Sun Feb 9 23:20:18 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Feb 11 14:41:43 2014 -0500

    Sublime: Pass language and config properly

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 52411e8..604bfcc 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -403,7 +403,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, target, config, language);
+  lg->AddCompileOptions(flags, target, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));

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

Summary of changes:
 Source/cmExtraSublimeTextGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake