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 ad634507d0155978a0744b5d3b896e696aecc5e1 (commit)
via 49df5d480045ea77295825f2968ec57c4146b5d8 (commit)
from 4ba010d93f20335ca5e643c0f1ec196a5a6efc6b (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=ad634507d0155978a0744b5d3b896e696aecc5e1
commit ad634507d0155978a0744b5d3b896e696aecc5e1
Merge: 4ba010d 49df5d4
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Jul 11 14:55:21 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jul 11 14:55:21 2016 -0400
Merge topic 'cpack-rpm-debug-logging-fix' into next
49df5d48 Debug logging should only print if requested for
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49df5d480045ea77295825f2968ec57c4146b5d8
commit 49df5d480045ea77295825f2968ec57c4146b5d8
Author: Harry Mallon <ha...@codexdigital.com>
AuthorDate: Mon Jul 11 20:53:31 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon Jul 11 20:53:31 2016 +0200
Debug logging should only print if requested for
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7706bbc..7a1cbef 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -859,7 +859,9 @@ function(cpack_rpm_prepare_content_list)
if(NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share
/usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
- message("CPackRPM:Debug: Adding
${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+ if(CPACK_RPM_PACKAGE_DEBUG)
+ message("CPackRPM:Debug: Adding
${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+ endif()
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST
"${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackRPM.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
