summaryrefslogtreecommitdiff
path: root/Source/cmExtraSublimeTextGenerator.cxx
diff options
context:
space:
mode:
authorRobert Maynard <robert.maynard@kitware.com>2013-02-11 17:23:02 -0500
committerBrad King <brad.king@kitware.com>2013-02-19 14:45:18 -0500
commitf616ff2c25e9902ed1cffc15f19d9299b83cba5a (patch)
tree67ec2cd214cf065ae2983ee802b75eaacd2a0bd8 /Source/cmExtraSublimeTextGenerator.cxx
parent674bd6e7788f9e6ff35c0082c9c85e9aa83b642d (diff)
downloadcmake-f616ff2c25e9902ed1cffc15f19d9299b83cba5a.tar.gz
Update generator to use new cmGeneratorTarget api.
Diffstat (limited to 'Source/cmExtraSublimeTextGenerator.cxx')
-rw-r--r--Source/cmExtraSublimeTextGenerator.cxx25
1 files changed, 14 insertions, 11 deletions
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index ef29329f2d..5431401646 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -11,14 +11,16 @@
See the License for more information.
============================================================================*/
#include "cmExtraSublimeTextGenerator.h"
+#include "cmake.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
#include "cmGlobalUnixMakefileGenerator3.h"
+#include "cmLocalGenerator.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
-#include "cmake.h"
#include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
#include "cmSystemTools.h"
+#include "cmTarget.h"
#include "cmXMLSafe.h"
#include <cmsys/SystemTools.hxx>
@@ -253,10 +255,11 @@ void cmExtraSublimeTextGenerator::
cmTarget* target,
const char* make,
const cmMakefile* makefile,
- const char* compiler,
+ const char*, //compiler
MapSourceFileFlags& sourceFileFlags,
bool firstTarget)
{
+
if (target != 0)
{
cmGeneratorTarget *gtgt = this->GlobalGenerator
@@ -426,7 +429,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
lg->AppendFlags(flags, makefile->GetDefineFlags());
// Add target-specific flags.
- if(gtgt->GetProperty("COMPILE_FLAGS"))
+ if(target->GetProperty("COMPILE_FLAGS"))
{
std::string langIncludeExpr = "CMAKE_";
langIncludeExpr += language;
@@ -437,7 +440,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
cmsys::RegularExpression r(regex);
std::vector<std::string> args;
cmSystemTools::
- ParseWindowsCommandLine(gtgt->GetProperty("COMPILE_FLAGS"), args);
+ ParseWindowsCommandLine(target->GetProperty("COMPILE_FLAGS"), args);
for(std::vector<std::string>::iterator i = args.begin();
i != args.end(); ++i)
{
@@ -449,12 +452,12 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
}
else
{
- lg->AppendFlags(flags, gtgt->GetProperty("COMPILE_FLAGS"));
+ lg->AppendFlags(flags, target->GetProperty("COMPILE_FLAGS"));
}
}
// Add source file specific flags.
- lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
+ lg->AppendFlags(flags, target->GetProperty("COMPILE_FLAGS"));
// TODO: Handle Apple frameworks.
@@ -466,7 +469,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
std::string
cmExtraSublimeTextGenerator::
ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
- cmGeneratorTarget* gtgt)
+ cmGeneratorTarget*)
{
std::set<std::string> defines;
@@ -485,12 +488,12 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
}
// Add preprocessor definitions for this target and configuration.
- lg->AppendDefines(defines, gtgt->GetCompileDefinitions());
+ lg->AppendDefines(defines, target->GetCompileDefinitions());
lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
{
std::string defPropName = "COMPILE_DEFINITIONS_";
defPropName += cmSystemTools::UpperCase(config);
- lg->AppendDefines(defines, gtgt->GetCompileDefinitions(config));
+ lg->AppendDefines(defines, target->GetCompileDefinitions(config));
lg->AppendDefines(defines, source->GetProperty(defPropName.c_str()));
}