diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-22 12:48:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-22 12:48:45 (GMT) |
| commit | 053317480a12464d405490502dfde75c5fc17b1f (patch) | |
| tree | a76bc95f8f68a55a51c9de98620c4a474b6769ad /Modules/CPackRPM.cmake | |
| parent | 7ebbe4f9d853a5823ef47a13b53ef7e1f469bd2e (diff) | |
| parent | 5606622e61e7f6eba74326510cea8dd0128ab2aa (diff) | |
| download | CMake-053317480a12464d405490502dfde75c5fc17b1f.zip CMake-053317480a12464d405490502dfde75c5fc17b1f.tar.gz CMake-053317480a12464d405490502dfde75c5fc17b1f.tar.bz2 | |
Merge topic 'cpack-rpm-debuginfo-multiple-files-fix'
5606622e CPack/RPM: fix cpack_rpm_debugsymbol_check parameter
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !595
Diffstat (limited to 'Modules/CPackRPM.cmake')
| -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 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) |