summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-05-21 19:12:58 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-05-21 19:12:58 (GMT)
commita784e6f9f7d022268c9f8dbffc55847180f2f2fb (patch)
treedd93d9eec8d3aca51515f46d17beacfd2c9463b9 /Source
parentf292ffb62cf2251c1239f4750487efeb52daf1d7 (diff)
parent8e947670cf2af581fb7b97f040e687aa6a2404e0 (diff)
downloadCMake-a784e6f9f7d022268c9f8dbffc55847180f2f2fb.zip
CMake-a784e6f9f7d022268c9f8dbffc55847180f2f2fb.tar.gz
CMake-a784e6f9f7d022268c9f8dbffc55847180f2f2fb.tar.bz2
Merge topic 'fix-sublime-source-flags'
8e94767 Sublime: Honor source-level COMPILE_FLAGS property
Diffstat (limited to 'Source')
-rw-r--r--Source/cmExtraSublimeTextGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
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.