mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 10:18:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpack-rpm-debuginfo-multiple-files-fix'

Browse Source 
5606622e CPack/RPM: fix cpack_rpm_debugsymbol_check parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !595
This commit is contained in:
Brad King
2017-03-22 12:48:41 +00:00
committed by Kitware Robot
parent 7ebbe4f9d8 5606622e61
commit 053317480a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/CPackRPM.cmake
View File

@@ -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)