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, master has been updated
via 32e95a7b24b057e410f0d49fa10a3d05452be264 (commit)
via 67303794f0bd36912cd9e7e7d0402c3c6fc85a11 (commit)
via d23a0196844f066047aa6942b69c6e591462df38 (commit)
via 1afbe7d2cca61ecf483f7697b0141a233508603d (commit)
from d5ab04f065b85a300c348236519b4c024dd19377 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32e95a7b24b057e410f0d49fa10a3d05452be264
commit 32e95a7b24b057e410f0d49fa10a3d05452be264
Merge: d5ab04f 6730379
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 30 08:37:22 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Nov 30 08:37:22 2016 -0500
Merge topic 'end-commands'
67303794 Combine all unexpected commands to a single class
d23a0196 Set the error after argument expansion in end commands
1afbe7d2 Make error message of standalone endwhile command consistent
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 16 +-----
Source/cmCommands.cxx | 43 ++++++++++-----
Source/cmElseCommand.cxx | 14 -----
Source/cmElseCommand.h | 45 ----------------
Source/cmElseIfCommand.cxx | 13 -----
Source/cmElseIfCommand.h | 45 ----------------
Source/cmEndForEachCommand.cxx | 15 ------
Source/cmEndForEachCommand.h | 56 --------------------
Source/cmEndFunctionCommand.cxx | 15 ------
Source/cmEndFunctionCommand.h | 56 --------------------
Source/cmEndIfCommand.cxx | 24 ---------
Source/cmEndIfCommand.h | 45 ----------------
Source/cmEndMacroCommand.cxx | 15 ------
Source/cmEndMacroCommand.h | 56 --------------------
Source/cmEndWhileCommand.cxx | 22 --------
Source/cmEndWhileCommand.h | 56 --------------------
Source/cmUnexpectedCommand.cxx | 22 ++++++++
...eMangledMesaCommand.h => cmUnexpectedCommand.h} | 28 +++++++---
Tests/RunCMake/while/EndAlone-stderr.txt | 2 +-
bootstrap | 7 +--
20 files changed, 76 insertions(+), 519 deletions(-)
delete mode 100644 Source/cmElseCommand.cxx
delete mode 100644 Source/cmElseCommand.h
delete mode 100644 Source/cmElseIfCommand.cxx
delete mode 100644 Source/cmElseIfCommand.h
delete mode 100644 Source/cmEndForEachCommand.cxx
delete mode 100644 Source/cmEndForEachCommand.h
delete mode 100644 Source/cmEndFunctionCommand.cxx
delete mode 100644 Source/cmEndFunctionCommand.h
delete mode 100644 Source/cmEndIfCommand.cxx
delete mode 100644 Source/cmEndIfCommand.h
delete mode 100644 Source/cmEndMacroCommand.cxx
delete mode 100644 Source/cmEndMacroCommand.h
delete mode 100644 Source/cmEndWhileCommand.cxx
delete mode 100644 Source/cmEndWhileCommand.h
create mode 100644 Source/cmUnexpectedCommand.cxx
copy Source/{cmUseMangledMesaCommand.h => cmUnexpectedCommand.h} (51%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
