[Cmake-commits] CMake branch, next, updated. v3.6.0-796-g1b9b42e

[Brad King]

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  1b9b42e76080adb45bb395bd2b8cdc312b7fcb2e (commit)
       via  83799aa934615a932a181518a539150aa8cd43fd (commit)
      from  347ab9b4d07a0472f895e8ac1715dfe280ef0b99 (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=1b9b42e76080adb45bb395bd2b8cdc312b7fcb2e
commit 1b9b42e76080adb45bb395bd2b8cdc312b7fcb2e
Merge: 347ab9b 83799aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 13 09:23:40 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 13 09:23:40 2016 -0400

    Merge topic 'cpack-rpm-debug-logging-fix' into next
    
    83799aa9 CPack/RPM: Debug logging should only print if requested for


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83799aa934615a932a181518a539150aa8cd43fd
commit 83799aa934615a932a181518a539150aa8cd43fd
Author:     Harry Mallon <harry at codexdigital.com>
AuthorDate: Mon Jul 11 20:53:31 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 13 09:23:24 2016 -0400

    CPack/RPM: 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:


hooks/post-receive
-- 
CMake