[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-692-g02854fb

Kitware Robot kwrobot at kitware.com
Wed Apr 5 10:45:04 EDT 2017


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  c6344769be9302414d662ad26f398abcb12d7dd0 (commit)
       via  02854fb634fbc1f2401f22d2fbfd00519308423e (commit)
       via  988dc63683e046fd68ea6915036cc61f94fc8acf (commit)
       via  4d486b262a4c232cdd7cef4cfa1d2691e689e295 (commit)
       via  ccf98c5a484552dee0b616ec37c4ea805d717728 (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 (c6344769be9302414d662ad26f398abcb12d7dd0)
            \
             N -- N -- N (02854fb634fbc1f2401f22d2fbfd00519308423e)

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=02854fb634fbc1f2401f22d2fbfd00519308423e
commit 02854fb634fbc1f2401f22d2fbfd00519308423e
Merge: 988dc63 8243fe7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 5 14:31:04 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Apr 5 10:44:27 2017 -0400

    Stage topic 'codelite-virtual-dirs'
    
    Topic-id: 23432
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/653


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

Summary of changes:
 Help/command/include_external_msproject.rst        |    3 +++
 .../dev/include_external_msproject-map-config.rst  |    7 +++++
 Source/cmGlobalVisualStudio71Generator.cxx         |   16 ++++++++----
 Source/cmGlobalVisualStudio71Generator.h           |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx          |    5 ++--
 Source/cmGlobalVisualStudio7Generator.h            |    2 +-
 Source/cmGlobalVisualStudio8Generator.cxx          |   13 +++++++---
 Source/cmGlobalVisualStudio8Generator.h            |    2 +-
 .../CustomConfig-check.cmake                       |    1 +
 .../{CustomGuid.cmake => CustomConfig.cmake}       |    1 +
 .../CustomGuid-check.cmake                         |    2 +-
 .../CustomGuidTypePlatform-check.cmake             |    2 +-
 .../CustomTypePlatform-check.cmake                 |    2 +-
 .../include_external_msproject/RunCMakeTest.cmake  |    1 +
 .../include_external_msproject/check_utils.cmake   |   27 +++++++++++++++++++-
 15 files changed, 68 insertions(+), 18 deletions(-)
 create mode 100644 Help/release/dev/include_external_msproject-map-config.rst
 create mode 100644 Tests/RunCMake/include_external_msproject/CustomConfig-check.cmake
 copy Tests/RunCMake/include_external_msproject/{CustomGuid.cmake => CustomConfig.cmake} (53%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list