[Cmake-commits] CMake branch, next, updated. v3.2.2-2186-g0228a6d

Stephen Kelly steveire at gmail.com
Sun Apr 26 16:05:22 EDT 2015


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  0228a6dd0e23c3932843b9bd417837b964d4cbf1 (commit)
       via  21b41bbdf0b1bcd01024f3d2bee4eec5bbc1f0ef (commit)
      from  0b1205035e42dd71987a3f663e8b1b1f3b93f1e3 (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=0228a6dd0e23c3932843b9bd417837b964d4cbf1
commit 0228a6dd0e23c3932843b9bd417837b964d4cbf1
Merge: 0b12050 21b41bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 26 16:05:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 26 16:05:22 2015 -0400

    Merge topic 'refactor-cmDefinitions' into next
    
    21b41bbd Missing sort.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21b41bbdf0b1bcd01024f3d2bee4eec5bbc1f0ef
commit 21b41bbdf0b1bcd01024f3d2bee4eec5bbc1f0ef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 26 22:04:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 26 22:04:50 2015 +0200

    Missing sort.

diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index a39855f..bf517e3 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -107,6 +107,7 @@ cmDefinitions::Keys(std::vector<std::string>& undefined) const
     std::vector<std::string>& m = mi->second.Exists? defined : undefined;
     m.push_back(mi->first);
     }
+  std::sort(defined.begin(), defined.end());
   std::sort(undefined.begin(), undefined.end());
   undefined.erase(std::unique(undefined.begin(), undefined.end()),
                   undefined.end());

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

Summary of changes:
 Source/cmDefinitions.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list