[Cmake-commits] CMake branch, next, updated. v3.6.1-1794-gd16d98e
Domen Vrankar
domen.vrankar at gmail.com
Mon Sep 5 18:24:16 EDT 2016
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, next has been updated
via d16d98e86a084508666fd9768b779ae0ce96763a (commit)
via 87a944984abeacbc984e3197f7bcfe54faf6aaad (commit)
from ed5cd9993461fabf38e9986dc52b304cd5f2830b (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=d16d98e86a084508666fd9768b779ae0ce96763a
commit d16d98e86a084508666fd9768b779ae0ce96763a
Merge: ed5cd99 87a9449
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Sep 5 18:24:15 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 5 18:24:15 2016 -0400
Merge topic 'cpack-deb-package-description-fallback' into next
87a94498 fixup! cpack-deb-package-description-fallback
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87a944984abeacbc984e3197f7bcfe54faf6aaad
commit 87a944984abeacbc984e3197f7bcfe54faf6aaad
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Sep 6 00:23:41 2016 +0200
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Sep 6 00:23:41 2016 +0200
fixup! cpack-deb-package-description-fallback
Default description file path is set by CPack.cmake
script so handle the case when that script is
not used.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index cbba186..25c25ae 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -167,7 +167,8 @@
# based installers only) if set,
# - :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default location,
# - :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
-# - :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default location content
+# - :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set,
+# - or "no package description available"
#
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
# CPACK_DEBIAN_<COMPONENT>_PACKAGE_SECTION
@@ -826,8 +827,10 @@ function(cpack_deb_prepare_package_vars)
file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}" CPACK_DEBIAN_PACKAGE_DESCRIPTION)
elseif(CPACK_PACKAGE_DESCRIPTION_SUMMARY)
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
- else() # use default package description file content
+ elseif(CPACK_PACKAGE_DESCRIPTION_FILE) # use default package description file content
file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}" CPACK_DEBIAN_PACKAGE_DESCRIPTION)
+ else()
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "no package description available")
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackDeb.cmake | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list