From 2aed6fd98fecc270b7a41b5f09cb364a8c03ddb9 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Tue, 7 Apr 2020 18:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3rpm=E5=8C=85=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/Package.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 16133dc..83d6447 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,7 +1,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(MY_RPM_NAME_PREFIX "${lib_name}-debug") + set(MY_RPM_NAME_PREFIX "lib${lib_name}-debug") else() - set(MY_RPM_NAME_PREFIX "${lib_name}") + set(MY_RPM_NAME_PREFIX "lib${lib_name}") endif() message(STATUS "Package: ${MY_RPM_NAME_PREFIX}") @@ -28,10 +28,11 @@ set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE) set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) +set(CPACK_RPM_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) if(ENABLE_DEVEL) set(CPACK_RPM_FILE_NAME "${MY_RPM_NAME_PREFIX}-devel-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") - set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-debuginfo-devel-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") + set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-devel-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_COMPONENT_LIBRARY_GROUP "devel") set(CPACK_COMPONENT_HEADER_GROUP "devel")