[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-527-ga51e7a1

[Kitware Robot]

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  a51e7a14130a99eb1d759ac2da846f55a0102336 (commit)
       via  84b16147206b2c4195c647ef359c2ace8c8cc172 (commit)
      from  e1b9c80a725b786bce6f6e7b77a7e1bc3f9f4a10 (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=a51e7a14130a99eb1d759ac2da846f55a0102336
commit a51e7a14130a99eb1d759ac2da846f55a0102336
Merge: e1b9c80 84b1614
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Mar 21 07:33:43 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 21 03:33:46 2017 -0400

    Stage topic 'cpack-rpm-debuginfo-multiple-files-fix'
    
    Topic-id: 23135
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/595


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84b16147206b2c4195c647ef359c2ace8c8cc172
commit 84b16147206b2c4195c647ef359c2ace8c8cc172
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Mar 21 02:38:30 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Mar 21 08:31:29 2017 +0100

    CPack/RPM: cpack_rpm_debugsymbol_check parameter fix
    
    CPACK_RPM_INSTALL_FILES must be converted
    into a list before it is used as parameter
    to cpack_rpm_debugsymbol_check.
    
    Closes #16717

diff --git a/Help/release/dev/cpack-rpm-debuginfo-multiple-files-fix.rst b/Help/release/dev/cpack-rpm-debuginfo-multiple-files-fix.rst
new file mode 100644
index 0000000..3f5c0ea
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-debuginfo-multiple-files-fix.rst
@@ -0,0 +1,7 @@
+cpack-rpm-debuginfo-multiple-files-fix
+--------------------------------------
+
+* The :module:`CPackRPM` module learned how to more correctly
+  handle adding of source files to debuginfo packages and
+  skip geneartion of debuginfo packages without sources
+  with an author warning.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7a7c170..2e69195 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2156,7 +2156,9 @@ function(cpack_rpm_generate_package)
         if(CPACK_RPM_DEBUGINFO_PACKAGE)
           # only add current package files to debuginfo list if debuginfo
           # generation is enabled for current package
-          set(install_files_ "${CPACK_RPM_INSTALL_FILES}")
+          string(STRIP "${CPACK_RPM_INSTALL_FILES}" install_files_)
+          string(REPLACE "\n" ";" install_files_ "${install_files_}")
+          string(REPLACE "\"" "" install_files_ "${install_files_}")
         else()
           unset(install_files_)
         endif()
@@ -2214,7 +2216,11 @@ function(cpack_rpm_generate_package)
 
         cpack_rpm_debugsymbol_check("${install_files_}" "${WDIR}")
       else()
-        cpack_rpm_debugsymbol_check("${CPACK_RPM_INSTALL_FILES}" "${WDIR}")
+        string(STRIP "${CPACK_RPM_INSTALL_FILES}" install_files_)
+        string(REPLACE "\n" ";" install_files_ "${install_files_}")
+        string(REPLACE "\"" "" install_files_ "${install_files_}")
+
+        cpack_rpm_debugsymbol_check("${install_files_}" "${WDIR}")
       endif()
 
       if(TMP_DEBUGINFO_ADDITIONAL_SOURCES)

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/cpack-rpm-debuginfo-multiple-files-fix.rst |    7 +++++++
 Modules/CPackRPM.cmake                                      |   10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/cpack-rpm-debuginfo-multiple-files-fix.rst


hooks/post-receive
-- 
CMake