diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-21 13:09:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-21 13:09:40 (GMT) |
| commit | 68115cf0ea67f9b4d75a4aa8a8dee33755807c66 (patch) | |
| tree | a937aa134c71c0f9c026119781ec7aee10731779 /Modules | |
| parent | 50856e948e4d4898aaa6a811b35976bf68a11f6b (diff) | |
| parent | 5606622e61e7f6eba74326510cea8dd0128ab2aa (diff) | |
| download | CMake-68115cf0ea67f9b4d75a4aa8a8dee33755807c66.zip CMake-68115cf0ea67f9b4d75a4aa8a8dee33755807c66.tar.gz CMake-68115cf0ea67f9b4d75a4aa8a8dee33755807c66.tar.bz2 | |
Merge branch 'cpack-rpm-debuginfo-multiple-files-fix' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackRPM.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
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) |