[Cmake-commits] CMake branch, master, updated. v3.3.2-1260-g442d17e
Brad King
brad.king at kitware.com
Tue Sep 22 10:47:12 EDT 2015
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 442d17ef6c50a3ffc83ed6a860dc05febd85f1b4 (commit)
via b58de9fe2ba4ac3e194403ecd118fd54681ffae8 (commit)
via 47b060aee0871bdb5fea63b398a1f1cb07fa3b37 (commit)
from fcd9f85660bb0de569a5a5770b98eb7d922fbd6b (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=442d17ef6c50a3ffc83ed6a860dc05febd85f1b4
commit 442d17ef6c50a3ffc83ed6a860dc05febd85f1b4
Merge: fcd9f85 b58de9f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 22 10:47:11 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 22 10:47:11 2015 -0400
Merge topic 'cpack-package-empty-dirs'
b58de9fe CPack: allow packaging of empty directories
47b060ae CPackDeb: allow empty directories in component packages
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/cpack-package-empty-dirs.rts | 4 ++++
Source/CPack/cmCPackDebGenerator.cxx | 2 ++
Source/CPack/cmCPackGenerator.cxx | 5 +++++
Source/cmSystemTools.cxx | 21 ++++++++++++++++++++
Tests/CPackComponentsDEB/CMakeLists.txt | 3 +--
Tests/RunCMake/CPack/CMakeLists.txt | 2 +-
Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake | 5 +++++
.../DEB/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake | 5 +++++
.../CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake | 2 ++
.../CPack/DEB/EMPTY_DIR-ExpectedFiles.cmake | 5 +++++
...L-specifics.cmake => EMPTY_DIR-specifics.cmake} | 0
Tests/RunCMake/CPack/EMPTY_DIR.cmake | 4 ++++
.../RPM/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake | 5 +++++
.../CPack/RPM/COMPONENTS_EMPTY_DIR-stderr.txt | 1 +
.../CPack/RPM/EMPTY_DIR-ExpectedFiles.cmake | 5 +++++
Tests/RunCMake/CPack/RPM/EMPTY_DIR-stderr.txt | 1 +
Tests/RunCMake/CPack/RunCMakeTest.cmake | 2 ++
17 files changed, 69 insertions(+), 3 deletions(-)
create mode 100644 Help/release/dev/cpack-package-empty-dirs.rts
create mode 100644 Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake
create mode 100644 Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
create mode 100644 Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake
create mode 100644 Tests/RunCMake/CPack/DEB/EMPTY_DIR-ExpectedFiles.cmake
copy Tests/RunCMake/CPack/DEB/{MINIMAL-specifics.cmake => EMPTY_DIR-specifics.cmake} (100%)
create mode 100644 Tests/RunCMake/CPack/EMPTY_DIR.cmake
create mode 100644 Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
create mode 100644 Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-stderr.txt
create mode 100644 Tests/RunCMake/CPack/RPM/EMPTY_DIR-ExpectedFiles.cmake
create mode 100644 Tests/RunCMake/CPack/RPM/EMPTY_DIR-stderr.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list