summaryrefslogtreecommitdiffstats
path: root/Source/cmExtraSublimeTextGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-05-16 12:59:04 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-06-02 09:56:36 (GMT)
commit35496761a58956bd8c5ad65a3ed9ee78d09af56b (patch)
treef02c889f4da5c1da5d9a6eef5d9ea73fbc0f1a16 /Source/cmExtraSublimeTextGenerator.cxx
parentf3ad863ae6f0487bbf80d95b0d3f622840187a6a (diff)
downloadCMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.zip
CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.tar.gz
CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.tar.bz2
Add cmLocalGenerator::GetCompileOptions.
Currently it only adds the contents of the COMPILE_FLAGS target property, but it can be extended to handle a new COMPILE_OPTIONS generator expression enabled property.
Diffstat (limited to 'Source/cmExtraSublimeTextGenerator.cxx')
-rw-r--r--Source/cmExtraSublimeTextGenerator.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 62e9194..29d86a6 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -429,7 +429,9 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
lg->AppendFlags(flags, makefile->GetDefineFlags());
// Add target-specific flags.
- if(target->GetProperty("COMPILE_FLAGS"))
+ std::string targetFlags;
+ lg->GetCompileOptions(targetFlags, target, config);
+ if (!targetFlags.empty())
{
std::string langIncludeExpr = "CMAKE_";
langIncludeExpr += language;
@@ -440,7 +442,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
cmsys::RegularExpression r(regex);
std::vector<std::string> args;
cmSystemTools::
- ParseWindowsCommandLine(target->GetProperty("COMPILE_FLAGS"), args);
+ ParseWindowsCommandLine(targetFlags.c_str(), args);
for(std::vector<std::string>::iterator i = args.begin();
i != args.end(); ++i)
{
@@ -452,7 +454,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
}
else
{
- lg->AppendFlags(flags, target->GetProperty("COMPILE_FLAGS"));
+ lg->AppendFlags(flags, targetFlags.c_str());
}
}