summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-12 16:31:28 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-02-12 16:31:28 (GMT)
commit764d467d24ca07eb6ebaad33be1c7f7f56294e8c (patch)
tree1db79eca4c2ca9d89e5dc19f665a0b44c88a62bf
parent0d177cf383fbca1d23fcd57672683d66c403d738 (diff)
parent2d9f93ab24872bebc77be8ac388592ddfaa76e45 (diff)
downloadCMake-764d467d24ca07eb6ebaad33be1c7f7f56294e8c.zip
CMake-764d467d24ca07eb6ebaad33be1c7f7f56294e8c.tar.gz
CMake-764d467d24ca07eb6ebaad33be1c7f7f56294e8c.tar.bz2
Merge topic 'dev/fix-sublime-compile-flags'
2d9f93ab Sublime: Pass language and config properly
-rw-r--r--Source/cmExtraSublimeTextGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
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"));