[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7378-g0f547e2

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0f547e2dc673fcb9d42a26096eff4977d9cb6298 (commit)
       via  dcd443d4aaf63c40e567a927b5be779f9be4b33e (commit)
       via  cd711ed0526de706c17c228e06f5010772cd217c (commit)
      from  9c8e0bf7db422f3ff0c5ad5f6ab886ace98c8c07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f547e2dc673fcb9d42a26096eff4977d9cb6298
commit 0f547e2dc673fcb9d42a26096eff4977d9cb6298
Merge: 9c8e0bf dcd443d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 2 16:16:15 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 2 16:16:15 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    dcd443d4 cmTarget: Clean up the InsertCompileDefinition implementation.
    cd711ed0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcd443d4aaf63c40e567a927b5be779f9be4b33e
commit dcd443d4aaf63c40e567a927b5be779f9be4b33e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 2 22:09:55 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 2 22:15:07 2014 +0100

    cmTarget: Clean up the InsertCompileDefinition implementation.
    
    It accepts a before parameter but is never called with before=true.
    
    compile definitions are sorted by std::set, so it wouldn't make sense
    to allow user sorting.

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();
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmTarget.cxx       |    9 ++-------
 Source/cmTarget.h         |    3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake