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 76444957c1978deea8d15b906e733d5e1e33e7db (commit)
via 4e4b786e33cb67250a026efc1bbba6bba8575a07 (commit)
via a5a6f61be37bd7fa6997e40ed43b3450834b265e (commit)
from f6f42b25c841d807536ec533a5a738d7dd6f02dd (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=76444957c1978deea8d15b906e733d5e1e33e7db
commit 76444957c1978deea8d15b906e733d5e1e33e7db
Merge: f6f42b2 4e4b786
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Dec 5 09:23:26 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 5 09:23:26 2016 -0500
Merge topic 'cpack-rpm-user-file-list-with-multiple-directives'
4e4b786e CPack/RPM CPACK_RPM_USER_FILELIST change release note
a5a6f61b CPackRPM now supports multiple directives in
CPACK_RPM_USER_FILELIST
-----------------------------------------------------------------------
Summary of changes:
.../cpack-rpm-user-file-list-with-multiple-directives.rst | 6 ++++++
Modules/CPackRPM.cmake | 13 ++++++++-----
Tests/RunCMake/CPack/RunCMakeTest.cmake | 1 +
.../CPack/tests/USER_FILELIST/ExpectedFiles.cmake | 2 ++
.../RunCMake/CPack/tests/USER_FILELIST/VerifyResult.cmake | 12 ++++++++++++
Tests/RunCMake/CPack/tests/USER_FILELIST/test.cmake | 13 +++++++++++++
6 files changed, 42 insertions(+), 5 deletions(-)
create mode 100644
Help/release/dev/cpack-rpm-user-file-list-with-multiple-directives.rst
create mode 100644 Tests/RunCMake/CPack/tests/USER_FILELIST/ExpectedFiles.cmake
create mode 100644 Tests/RunCMake/CPack/tests/USER_FILELIST/VerifyResult.cmake
create mode 100644 Tests/RunCMake/CPack/tests/USER_FILELIST/test.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
