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

cmNinjaTargetGenerator: Use GetDefines method 

Simplify the per-source ComputeDefines implementation by getting
target-wide defines from GetDefines.  Technically this changes behavior
by no-longer de-duplicating/sorting defines from both the target and the
source, but this makes it consistent with the Makefile generator.  It
may also later help move target-wide defines into per-target compilation
rules.
This commit is contained in:
Brad King 2015-07-09 10:15:08 -04:00
parent eacacacdce
commit fed5eb5b0e
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmNinjaTargetGenerator.cxx
View File

@ -163,16 +163,6 @@ cmNinjaTargetGenerator::
ComputeDefines(cmSourceFile const* source, const std::string& language) ComputeDefines(cmSourceFile const* source, const std::string& language)
{ {
std::set<std::string> defines; std::set<std::string> defines;
// Add the export symbol definition for shared library objects.
if(const char* exportMacro = this->Target->GetExportMacro())
{
this->LocalGenerator->AppendDefines(defines, exportMacro);
}
// Add preprocessor definitions for this target and configuration.
this->LocalGenerator->AddCompileDefinitions(defines, this->Target,
this->GetConfigName(), language);
this->LocalGenerator->AppendDefines this->LocalGenerator->AppendDefines
(defines, (defines,
source->GetProperty("COMPILE_DEFINITIONS")); source->GetProperty("COMPILE_DEFINITIONS"));
@ -184,7 +174,7 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
source->GetProperty(defPropName)); source->GetProperty(defPropName));
} }
std::string definesString; std::string definesString = this->GetDefines(language);
this->LocalGenerator->JoinDefines(defines, definesString, this->LocalGenerator->JoinDefines(defines, definesString,
language); language);