kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sublime: Port some API to cmGeneratorTarget.

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-09 22:04:51 +02:00
parent 993aace78a
commit a143d4ac60
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmExtraSublimeTextGenerator.cxx
View File

@ -254,9 +254,9 @@ void cmExtraSublimeTextGenerator::
} }
std::vector<std::string>& flags = sourceFileFlagsIter->second; std::vector<std::string>& flags = sourceFileFlagsIter->second;
std::string flagsString = std::string flagsString =
this->ComputeFlagsForObject(*iter, lg, target, gtgt); this->ComputeFlagsForObject(*iter, lg, gtgt);
std::string definesString = std::string definesString =
this->ComputeDefines(*iter, lg, target, gtgt); this->ComputeDefines(*iter, lg, gtgt);
flags.clear(); flags.clear();
cmsys::RegularExpression flagRegex; cmsys::RegularExpression flagRegex;
// Regular expression to extract compiler flags from a string // Regular expression to extract compiler flags from a string
@ -364,7 +364,6 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
std::string std::string
cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source, cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
cmLocalGenerator* lg, cmLocalGenerator* lg,
cmTarget *target,
cmGeneratorTarget* gtgt) cmGeneratorTarget* gtgt)
{ {
std::string flags; std::string flags;
@ -389,7 +388,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
// } // }
// Add shared-library flags if needed. // Add shared-library flags if needed.
lg->AddCMP0018Flags(flags, target, language, config); lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
// Add include directory flags. // Add include directory flags.
{ {
@ -404,7 +403,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
lg->AppendFlags(flags, makefile->GetDefineFlags()); lg->AppendFlags(flags, makefile->GetDefineFlags());
// Add target-specific flags. // Add target-specific flags.
lg->AddCompileOptions(flags, target, language, config); lg->AddCompileOptions(flags, gtgt->Target, language, config);
// Add source file specific flags. // Add source file specific flags.
lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS")); lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@ -418,8 +417,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
// void cmMakefileTargetGenerator::WriteTargetLanguageFlags(). // void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
std::string std::string
cmExtraSublimeTextGenerator:: cmExtraSublimeTextGenerator::
ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target, ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
cmGeneratorTarget*) cmGeneratorTarget* target)
{ {
std::set<std::string> defines; std::set<std::string> defines;
@ -428,13 +427,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
// Add the export symbol definition for shared library objects. // Add the export symbol definition for shared library objects.
if(const char* exportMacro = target->GetExportMacro()) if(const char* exportMacro = target->Target->GetExportMacro())
{ {
lg->AppendDefines(defines, exportMacro); lg->AppendDefines(defines, exportMacro);
} }
// Add preprocessor definitions for this target and configuration. // Add preprocessor definitions for this target and configuration.
lg->AddCompileDefinitions(defines, target, config, language); lg->AddCompileDefinitions(defines, target->Target, config, language);
lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS")); lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
{ {
std::string defPropName = "COMPILE_DEFINITIONS_"; std::string defPropName = "COMPILE_DEFINITIONS_";

3
Source/cmExtraSublimeTextGenerator.h
View File

@ -79,11 +79,10 @@ private:
*/ */
std::string ComputeFlagsForObject(cmSourceFile *source, std::string ComputeFlagsForObject(cmSourceFile *source,
cmLocalGenerator* lg, cmLocalGenerator* lg,
cmTarget *target,
cmGeneratorTarget* gtgt); cmGeneratorTarget* gtgt);
std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
cmTarget *target, cmGeneratorTarget* gtgt); cmGeneratorTarget* gtgt);
}; };
#endif #endif