[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-613-gae2232a

[Kitware Robot]

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
  discards  896e195588bde813ad6e0cc8af7fe1594d37907c (commit)
  discards  10a48e620ee872e32642ed5ad1e993776be2a694 (commit)
  discards  eb3978b6688c4233a42b890ebc26e278940942b1 (commit)
  discards  bc35c1bb7b1175e79dd8bc177fb47f8367fae26b (commit)
  discards  3b32fdc5d1530368b5b05d009f59bca79759d1c1 (commit)
       via  ae2232a4e86e21e52f73c709feb729bd94271dca (commit)
       via  ccd7ef0b1fafe7581cb110702288cde898e18418 (commit)
       via  84804eb5b3f33d97f3ecb5902a5df280ec2d4f9e (commit)
       via  2cc0ea8d610b1b88b4494d0b39da1d6f848758ef (commit)
       via  62fe278118632236b3adcdbc0717e9f0088d331d (commit)
       via  3e4e6594da5668d7f80a1192594d9ee4fc790eb8 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (896e195588bde813ad6e0cc8af7fe1594d37907c)
            \
             N -- N -- N (ae2232a4e86e21e52f73c709feb729bd94271dca)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae2232a4e86e21e52f73c709feb729bd94271dca
commit ae2232a4e86e21e52f73c709feb729bd94271dca
Merge: ccd7ef0 dc5ea8e
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Mar 28 19:52:02 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 29 00:01:37 2017 -0400

    Stage topic '16742-swift-3.0'
    
    Topic-id: 23323
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/638


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccd7ef0b1fafe7581cb110702288cde898e18418
commit ccd7ef0b1fafe7581cb110702288cde898e18418
Merge: 84804eb fff3493
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 28 18:23:38 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 29 00:01:36 2017 -0400

    Stage topic 'vs-rc-defines'
    
    Topic-id: 23329
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/640

diff --cc Source/cmVisualStudioGeneratorOptions.cxx
index 1ca6b9c,da6f9a7..abc4924
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@@ -395,16 -259,19 +396,18 @@@ void cmVisualStudioGeneratorOptions::Ou
      if (!this->Configuration.empty()) {
        fout << prefix;
        this->TargetGenerator->WritePlatformConfigTag(
 -        "PreprocessorDefinitions", this->Configuration.c_str(), 0, 0, 0,
 -        &fout);
 +        tag, this->Configuration.c_str(), 0, 0, 0, &fout);
      } else {
 -      fout << prefix << "<PreprocessorDefinitions>";
 +      fout << prefix << "<" << tag << ">";
      }
    } else {
 -    fout << prefix << "PreprocessorDefinitions=\"";
 +    fout << prefix << tag << "=\"";
    }
    const char* sep = "";
+   std::vector<std::string>::const_iterator de =
+     cmRemoveDuplicates(this->Defines);
    for (std::vector<std::string>::const_iterator di = this->Defines.begin();
-        di != this->Defines.end(); ++di) {
+        di != de; ++di) {
      // Escape the definition for the compiler.
      std::string define;
      if (this->Version < cmGlobalVisualStudioGenerator::VS10) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84804eb5b3f33d97f3ecb5902a5df280ec2d4f9e
commit 84804eb5b3f33d97f3ecb5902a5df280ec2d4f9e
Merge: 2cc0ea8 62b85c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 28 17:40:51 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 29 00:01:36 2017 -0400

    Stage topic 'sphinx-cmake-theme'
    
    Topic-id: 23330
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/641


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cc0ea8d610b1b88b4494d0b39da1d6f848758ef
commit 2cc0ea8d610b1b88b4494d0b39da1d6f848758ef
Merge: 62fe278 7a411df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 28 14:39:31 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 29 00:01:36 2017 -0400

    Stage topic 'vfproj-object-libs-fix'
    
    Topic-id: 23318
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/636


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62fe278118632236b3adcdbc0717e9f0088d331d
commit 62fe278118632236b3adcdbc0717e9f0088d331d
Merge: 3e4e659 cdd2875
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 28 14:19:54 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 29 00:01:36 2017 -0400

    Stage topic 'update-kwsys'
    
    Topic-id: 23322
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/637


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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake