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

CPack/RPM: fix cpack_rpm_debugsymbol_check parameter

Browse Source 
`CPACK_RPM_INSTALL_FILES` must be converted into a list before it is
used as parameter to `cpack_rpm_debugsymbol_check`.

Fixes: #16717
This commit is contained in:
Domen Vrankar
2017-03-21 02:38:30 +01:00
committed by Brad King
parent e1adec32b8
commit 5606622e61
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

@@ -2141,7 +2141,9 @@ function(cpack_rpm_generate_package)
if(CPACK_RPM_DEBUGINFO_PACKAGE) if(CPACK_RPM_DEBUGINFO_PACKAGE)
# only add current package files to debuginfo list if debuginfo # only add current package files to debuginfo list if debuginfo
# generation is enabled for current package # 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() else()
unset(install_files_) unset(install_files_)
endif() endif()
@@ -2199,7 +2201,11 @@ function(cpack_rpm_generate_package)
cpack_rpm_debugsymbol_check("${install_files_}" "${WDIR}") cpack_rpm_debugsymbol_check("${install_files_}" "${WDIR}")
else() 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() endif()
if(TMP_DEBUGINFO_ADDITIONAL_SOURCES) if(TMP_DEBUGINFO_ADDITIONAL_SOURCES)