[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-526-gf84d1cd

[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
  discards  2bf434acb27f64aca0b397971078693f52ec166c (commit)
  discards  1895981eeb0f68d729bb07b53cc5adb1330b80f3 (commit)
  discards  84b16147206b2c4195c647ef359c2ace8c8cc172 (commit)
       via  f84d1cd2cd72a6f399b51d29d332d49194795337 (commit)
       via  b99cdd26b8e237500f6bdfdbffa55a15568f8dfb (commit)
       via  5606622e61e7f6eba74326510cea8dd0128ab2aa (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (2bf434acb27f64aca0b397971078693f52ec166c)
            \
             N -- N -- N (f84d1cd2cd72a6f399b51d29d332d49194795337)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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=f84d1cd2cd72a6f399b51d29d332d49194795337
commit f84d1cd2cd72a6f399b51d29d332d49194795337
Merge: b99cdd2 5606622
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 13:10:48 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 21 09:10:52 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=b99cdd26b8e237500f6bdfdbffa55a15568f8dfb
commit b99cdd26b8e237500f6bdfdbffa55a15568f8dfb
Merge: 9c77016 93e18d8
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Mar 21 11:59:09 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 21 09:10:09 2017 -0400

    Stage topic '14335-duplicate-else'
    
    Topic-id: 23133
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/594


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5606622e61e7f6eba74326510cea8dd0128ab2aa
commit 5606622e61e7f6eba74326510cea8dd0128ab2aa
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Mar 21 02:38:30 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 21 09:09:28 2017 -0400

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

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 722ee15..036875b 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2141,7 +2141,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()
@@ -2199,7 +2201,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 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 Help/release/dev/cpack-rpm-debuginfo-multiple-files-fix.rst


hooks/post-receive
-- 
CMake