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 39e830a98e81929ce95694f2f81d92ffd3f14d5b (commit)
via e5b70ed0137df3b72f279a039cbdae1a20784473 (commit)
via f2d98e2d3c9d7581703b124d3436312949dda141 (commit)
from 5bd78b0e999d28b163485232e434f5c7a5678ddd (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=39e830a98e81929ce95694f2f81d92ffd3f14d5b
commit 39e830a98e81929ce95694f2f81d92ffd3f14d5b
Merge: 5bd78b0 e5b70ed
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 6 14:58:11 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Nov 6 14:58:11 2015 -0500
Merge topic 'cpack-deb-config-file-source-field'
e5b70ed0 CPackDEB: added config file optional Source field
f2d98e2d CPackDEB: minor documentation and debug logging fixes
diff --cc Tests/CMakeLists.txt
index e13dc79,d42a322..f381758
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@@ -1033,10 -1033,10 +1033,11 @@@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=de
set(DEB_CONFIGURATIONS_TO_TEST "components-lintian-dpkgdeb-checks"
"components-description1"
"components-description2"
+ "components-source"
"components-shlibdeps1"
"components-depend1"
- "components-depend2")
+ "components-depend2"
+ "compression")
set(CPackGen "DEB")
set(CPackRun_CPackGen "-DCPackGen=${CPackGen}")
-----------------------------------------------------------------------
Summary of changes:
.../dev/cpack-deb-config-file-source-field.rst | 6 ++
Modules/CPackDeb.cmake | 63 +++++++++++++++-----
Source/CPack/cmCPackDebGenerator.cxx | 7 +++
Tests/CMakeLists.txt | 1 +
...=> MyLibCPackConfig-components-source.cmake.in} | 10 +++-
...> RunCPackVerifyResult-components-source.cmake} | 36 ++++-------
6 files changed, 82 insertions(+), 41 deletions(-)
create mode 100644 Help/release/dev/cpack-deb-config-file-source-field.rst
copy Tests/CPackComponentsDEB/{MyLibCPackConfig-components-depend2.cmake.in =>
MyLibCPackConfig-components-source.cmake.in} (71%)
copy Tests/CPackComponentsDEB/{RunCPackVerifyResult-components-depend1.cmake
=> RunCPackVerifyResult-components-source.cmake} (58%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
