[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-430-gce6dd58
Kitware Robot
kwrobot at kitware.com
Fri Mar 10 08:35:02 EST 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 300bb0623b398f55727eaeae256d0ef1ac67fdbe (commit)
discards c58f8d0e721cab3c4973308ec303454eb5e765b6 (commit)
discards c484e1de691ef9626ca3779aac21da3c1b83b5d5 (commit)
discards bd0df62be9277cc23c006811d9c649cf9b7d5f3a (commit)
discards 49c2f9f4a50bdab1b321a960aaa1de0aec30aee3 (commit)
discards 6f8957cb4a024b1641ff348fe9ccbf58460e3fb2 (commit)
discards 4645f6128114a896402a0e6a6770ac1607c4bb54 (commit)
discards ac1fb1575466c2f09f68f5b24da611a23f984dd8 (commit)
discards 65ebb6301f040aee231e4d51cab9d1a8f2288d70 (commit)
discards 87128b1cb62375719009bd1c55421849777edd2d (commit)
discards 0c90892fc84455b5182fa5f2a81a6d38555edb3e (commit)
discards f912d40db1a5f7aee94ff2ce2434be2215abaf6c (commit)
discards 7f0b6d32b5c45139bebe411500de64437a5f5b0c (commit)
discards d1571e3df8782e67073a654cd3881aea11d58fa6 (commit)
discards 93d6cbc2c5563f232cbb13d39ebd953e0b9908a0 (commit)
discards f2f6fcf621e09af9c2a8e01451b52e039c17e815 (commit)
discards e0fe19b880011a1cd5a2f1a0207cd0461cb0fdb9 (commit)
discards c5b7598ef7410727b81738c891ca1fa50bdca87a (commit)
discards 99ce2751a470df3e0ea61a303917ce5816c3519f (commit)
discards 9b231290d639fb206707a3a0e6342f3d7458f5ae (commit)
discards 097de72be2cbd43fb165f1995a1ea97bd45369b4 (commit)
discards b9ea0713e8f660fa94d46c44c40327b8665054fe (commit)
discards cca12f281673e60c1b0179416c5a12f2a7eca82b (commit)
via ce6dd589812287748de2f20773e14ce419c280db (commit)
via 0e0e77e513f121a0a3262f18632cb60560630cd0 (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 (300bb0623b398f55727eaeae256d0ef1ac67fdbe)
\
N -- N -- N (ce6dd589812287748de2f20773e14ce419c280db)
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=ce6dd589812287748de2f20773e14ce419c280db
commit ce6dd589812287748de2f20773e14ce419c280db
Merge: 0e0e77e f36eaf6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 10 13:24:42 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 10 08:28:42 2017 -0500
Stage topic 'refactor-module-def'
Topic-id: 22983
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/570
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e0e77e513f121a0a3262f18632cb60560630cd0
commit 0e0e77e513f121a0a3262f18632cb60560630cd0
Merge: 6d88659 b9d3682
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 9 16:17:32 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 10 08:28:42 2017 -0500
Stage topic 'pr.gcc_ar'
Topic-id: 22874
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/550
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-variables.7.rst | 1 -
Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst | 12 -
Modules/CMakeDetermineCUDACompiler.cmake | 51 ++---
Modules/CMakeDetermineCompilerId.cmake | 20 --
Modules/CompilerId/VS-10.vcxproj.in | 12 +-
Source/cmGlobalVisualStudio10Generator.cxx | 232 +-------------------
Source/cmGlobalVisualStudio10Generator.h | 16 --
Source/cmVS10CudaFlagTable.h | 51 -----
Source/cmVS10CudaHostFlagTable.h | 35 ---
Source/cmVisualStudio10TargetGenerator.cxx | 150 +------------
Source/cmVisualStudio10TargetGenerator.h | 5 -
Source/cmVisualStudioGeneratorOptions.cxx | 127 +----------
Source/cmVisualStudioGeneratorOptions.h | 22 --
Tests/CudaOnly/WithDefs/CMakeLists.txt | 11 +-
Tests/CudaOnly/WithDefs/main_for_vs.cu | 1 -
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 6 -
.../TestToolsetCudaBoth-stdout.txt | 2 -
.../GeneratorToolset/TestToolsetCudaBoth.cmake | 2 -
.../TestToolsetCudaOnly-stdout.txt | 2 -
.../GeneratorToolset/TestToolsetCudaOnly.cmake | 2 -
20 files changed, 34 insertions(+), 726 deletions(-)
delete mode 100644 Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst
delete mode 100644 Source/cmVS10CudaFlagTable.h
delete mode 100644 Source/cmVS10CudaHostFlagTable.h
delete mode 100644 Tests/CudaOnly/WithDefs/main_for_vs.cu
delete mode 100644 Tests/RunCMake/GeneratorToolset/TestToolsetCudaBoth-stdout.txt
delete mode 100644 Tests/RunCMake/GeneratorToolset/TestToolsetCudaBoth.cmake
delete mode 100644 Tests/RunCMake/GeneratorToolset/TestToolsetCudaOnly-stdout.txt
delete mode 100644 Tests/RunCMake/GeneratorToolset/TestToolsetCudaOnly.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list