Merge topic 'minor-cleanups'

dcd443d4 cmTarget: Clean up the InsertCompileDefinition implementation.
This commit is contained in:
Brad King 2014-02-03 11:11:16 -05:00 committed by CMake Topic Stage
commit e863496aca
2 changed files with 3 additions and 9 deletions

View File

@ -1620,16 +1620,11 @@ void cmTarget::InsertCompileOption(const cmValueWithOrigin &entry,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::InsertCompileDefinition(const cmValueWithOrigin &entry, void cmTarget::InsertCompileDefinition(const cmValueWithOrigin &entry)
bool before)
{ {
cmGeneratorExpression ge(entry.Backtrace); cmGeneratorExpression ge(entry.Backtrace);
std::vector<cmTargetInternals::TargetPropertyEntry*>::iterator position this->Internal->CompileDefinitionsEntries.push_back(
= before ? this->Internal->CompileDefinitionsEntries.begin()
: this->Internal->CompileDefinitionsEntries.end();
this->Internal->CompileDefinitionsEntries.insert(position,
new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry.Value))); new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry.Value)));
} }

View File

@ -531,8 +531,7 @@ public:
bool before = false); bool before = false);
void InsertCompileOption(const cmValueWithOrigin &entry, void InsertCompileOption(const cmValueWithOrigin &entry,
bool before = false); bool before = false);
void InsertCompileDefinition(const cmValueWithOrigin &entry, void InsertCompileDefinition(const cmValueWithOrigin &entry);
bool before = false);
void AppendBuildInterfaceIncludes(); void AppendBuildInterfaceIncludes();