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 8cc5e2cb87cc0b2868f10015688991f257371755 (commit)
via 384ae5514e423fccb02e48a4da25e1549556d898 (commit)
via 0be5020bf814efd040f7dcd35cc3a9f07d113458 (commit)
from 939792fdf6d16e192566b1e661725a8a72d6bc7d (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=8cc5e2cb87cc0b2868f10015688991f257371755
commit 8cc5e2cb87cc0b2868f10015688991f257371755
Merge: 939792f 384ae55
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 7 09:22:51 2015 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Dec 7 09:22:51 2015 -0500
Merge topic 'cmake-E-copy-multiple-inputs'
384ae551 cmake: Teach -E copy[_if_different] to support multiple files
(#15703)
0be5020b cmake: Improve '-E' help message formatting
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake.1.rst | 12 ++--
Help/release/dev/cmake-E-copy-multiple-inputs.rst | 5 ++
Source/cmcmd.cxx | 73 ++++++++++++++------
Tests/RunCMake/CommandLine/E-no-arg-stderr.txt | 2 +-
...ource-directory-target-is-directory-result.txt} | 0
...source-directory-target-is-directory-stderr.txt | 0
.../E_copy-one-source-file-result.txt} | 0
.../CommandLine/E_copy-one-source-file-stderr.txt | 1 +
...ee-source-files-target-is-directory-result.txt} | 0
...ree-source-files-target-is-directory-stderr.txt | 0
...y-three-source-files-target-is-file-result.txt} | 0
...py-three-source-files-target-is-file-stderr.txt | 1 +
...ad-source-files-target-is-directory-result.txt} | 0
...bad-source-files-target-is-directory-stderr.txt | 1 +
...ource-directory-target-is-directory-result.txt} | 0
...source-directory-target-is-directory-stderr.txt | 0
...ee-source-files-target-is-directory-result.txt} | 0
...ree-source-files-target-is-directory-stderr.txt | 0
...t-three-source-files-target-is-file-result.txt} | 0
...nt-three-source-files-target-is-file-stderr.txt | 1 +
.../CommandLine/E_create_symlink-no-arg-stderr.txt | 2 +-
.../CommandLine/E_rename-no-arg-stderr.txt | 2 +-
.../CommandLine/E_touch_nocreate-no-arg-stderr.txt | 2 +-
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 23 ++++++
.../RunCMake/CommandLine/copy_input/f1.txt | 0
.../RunCMake/CommandLine/copy_input/f2.txt | 0
.../RunCMake/CommandLine/copy_input/f3.txt | 0
27 files changed, 94 insertions(+), 31 deletions(-)
create mode 100644 Help/release/dev/cmake-E-copy-multiple-inputs.rst
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =>
CommandLine/E_copy-one-source-directory-target-is-directory-result.txt} (100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-stderr.txt
(100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
CommandLine/E_copy-one-source-file-result.txt} (100%)
create mode 100644 Tests/RunCMake/CommandLine/E_copy-one-source-file-stderr.txt
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =>
CommandLine/E_copy-three-source-files-target-is-directory-result.txt} (100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-stderr.txt
(100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
CommandLine/E_copy-three-source-files-target-is-file-result.txt} (100%)
create mode 100644
Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-stderr.txt
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-result.txt}
(100%)
create mode 100644
Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =>
CommandLine/E_copy_if_different-one-source-directory-target-is-directory-result.txt}
(100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-stderr.txt
(100%)
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =>
CommandLine/E_copy_if_different-three-source-files-target-is-directory-result.txt}
(100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-stderr.txt
(100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
CommandLine/E_copy_if_different-three-source-files-target-is-file-result.txt}
(100%)
create mode 100644
Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-stderr.txt
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/CommandLine/copy_input/f1.txt (100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/CommandLine/copy_input/f2.txt (100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/CommandLine/copy_input/f3.txt (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
