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

Return a std::string from GetCompileDefinitions.

This commit is contained in:
Stephen Kelly 2012-09-20 23:25:27 +02:00
parent b7e48e0acb
commit 2c2b25b203
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGeneratorTarget.cxx
View File

@ -314,7 +314,7 @@ std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories()
}
//----------------------------------------------------------------------------
const char *cmGeneratorTarget::GetCompileDefinitions(const char *config)
std::string cmGeneratorTarget::GetCompileDefinitions(const char *config)
{
if (!config)
{

2
Source/cmGeneratorTarget.h
View File

@ -74,7 +74,7 @@ public:
/** Get the include directories for this target. */
std::vector<std::string> GetIncludeDirectories();
const char *GetCompileDefinitions(const char *config = 0);
std::string GetCompileDefinitions(const char *config = 0);
private:
void ClassifySources();

5
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1648,10 +1648,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
this->AppendDefines(ppDefs, exportMacro);
}
cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
this->AppendDefines(ppDefs, gtgt->GetCompileDefinitions());
this->AppendDefines(ppDefs, gtgt->GetCompileDefinitions().c_str());
if(configName)
{
this->AppendDefines(ppDefs, gtgt->GetCompileDefinitions(configName));
this->AppendDefines(ppDefs,
gtgt->GetCompileDefinitions(configName).c_str());
}
buildSettings->AddAttribute
("GCC_PREPROCESSOR_DEFINITIONS", ppDefs.CreateList());

4
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -742,8 +742,8 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
targetOptions.ParseFinish();
cmGeneratorTarget* gt =
this->GlobalGenerator->GetGeneratorTarget(&target);
targetOptions.AddDefines(gt->GetCompileDefinitions());
targetOptions.AddDefines(gt->GetCompileDefinitions(configName));
targetOptions.AddDefines(gt->GetCompileDefinitions().c_str());
targetOptions.AddDefines(gt->GetCompileDefinitions(configName).c_str());
targetOptions.SetVerboseMakefile(
this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));

5
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -1231,9 +1231,10 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
clOptions.AddFlag("PrecompiledHeader", "NotUsing");
clOptions.Parse(flags.c_str());
clOptions.Parse(defineFlags.c_str());
clOptions.AddDefines(this->GeneratorTarget->GetCompileDefinitions());
clOptions.AddDefines(
this->GeneratorTarget->GetCompileDefinitions().c_str());
clOptions.AddDefines(this->GeneratorTarget->GetCompileDefinitions(
configName.c_str()));
configName.c_str()).c_str());
clOptions.SetVerboseMakefile(
this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));