summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-03 16:11:16 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-02-03 16:11:16 (GMT)
commite863496acafe4b11cd035032e147aa8f3e9b7208 (patch)
treef9a5601afb1bbf69e27f4bd1913dc777dde2b177
parent2e2552af65c30fc2fe56deb96ad60dfe971a9cb7 (diff)
parentdcd443d4aaf63c40e567a927b5be779f9be4b33e (diff)
downloadCMake-e863496acafe4b11cd035032e147aa8f3e9b7208.zip
CMake-e863496acafe4b11cd035032e147aa8f3e9b7208.tar.gz
CMake-e863496acafe4b11cd035032e147aa8f3e9b7208.tar.bz2
Merge topic 'minor-cleanups'
dcd443d4 cmTarget: Clean up the InsertCompileDefinition implementation.
-rw-r--r--Source/cmTarget.cxx9
-rw-r--r--Source/cmTarget.h3
2 files changed, 3 insertions, 9 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 21f8d4c..e51095e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1620,16 +1620,11 @@ void cmTarget::InsertCompileOption(const cmValueWithOrigin &entry,
}
//----------------------------------------------------------------------------
-void cmTarget::InsertCompileDefinition(const cmValueWithOrigin &entry,
- bool before)
+void cmTarget::InsertCompileDefinition(const cmValueWithOrigin &entry)
{
cmGeneratorExpression ge(entry.Backtrace);
- std::vector<cmTargetInternals::TargetPropertyEntry*>::iterator position
- = before ? this->Internal->CompileDefinitionsEntries.begin()
- : this->Internal->CompileDefinitionsEntries.end();
-
- this->Internal->CompileDefinitionsEntries.insert(position,
+ this->Internal->CompileDefinitionsEntries.push_back(
new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry.Value)));
}
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index ce0d812..271824b 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -531,8 +531,7 @@ public:
bool before = false);
void InsertCompileOption(const cmValueWithOrigin &entry,
bool before = false);
- void InsertCompileDefinition(const cmValueWithOrigin &entry,
- bool before = false);
+ void InsertCompileDefinition(const cmValueWithOrigin &entry);
void AppendBuildInterfaceIncludes();