summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDomen Vrankar <domen.vrankar@gmail.com>2017-03-23 22:36:47 (GMT)
committerDomen Vrankar <domen.vrankar@gmail.com>2017-03-24 18:52:02 (GMT)
commit6c09c5d64cad9c7d1c6be414ce918ac2d090b864 (patch)
tree98c2f8b920b34e1bfe6c0a0290c615728afa2aa1 /Modules
parentf0f60c548a3c3156f6488c1921f5b64ea33f5410 (diff)
downloadCMake-6c09c5d64cad9c7d1c6be414ce918ac2d090b864.zip
CMake-6c09c5d64cad9c7d1c6be414ce918ac2d090b864.tar.gz
CMake-6c09c5d64cad9c7d1c6be414ce918ac2d090b864.tar.bz2
CPack/RPM honor package file name on debuginfo enabled
Packages with debuginfo enabled should still honor defined package file name if file name is not set to RPM-DEFAULT. Fixes #16715
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPackRPM.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 2e69195..a81719e 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2648,8 +2648,8 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
unset(expected_filenames_)
unset(filenames_)
if(CPACK_RPM_DEBUGINFO_PACKAGE AND NOT CPACK_RPM_FILE_NAME STREQUAL "RPM-DEFAULT")
- string(TOLOWER "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.*\\.rpm" efn_)
- list(APPEND expected_filenames_ "${efn_}")
+ list(APPEND expected_filenames_
+ "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.*\\.rpm")
list(APPEND filenames_ "${CPACK_RPM_FILE_NAME}")
endif()