diff options
| author | 刘学利 <[email protected]> | 2020-04-15 17:16:28 +0800 |
|---|---|---|
| committer | 刘学利 <[email protected]> | 2020-04-15 17:16:28 +0800 |
| commit | 3fb34e8bbfc561cbf8b6e8af1e8835b8974f6ef1 (patch) | |
| tree | 9239d430ac3da8250137f0b4d075460a1fa06939 | |
| parent | 26840da7d8718a8ac5ab80be254c37f39dbc4c56 (diff) | |
| parent | ac9ea4e8f1ab27187ebbb65650484c6a37cb633e (diff) | |
Merge branch 'CI' into 'master'v2.0.0
删除executable的component
See merge request MESA_Platform/http!3
| -rw-r--r-- | cmake/Package.cmake | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index ed95dd3..f1a5aca 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,5 +1,5 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(MY_RPM_NAME_PREFIX "${lib_name}") + set(MY_RPM_NAME_PREFIX "${lib_name}-debug") else() set(MY_RPM_NAME_PREFIX "${lib_name}") endif() @@ -27,14 +27,13 @@ set(CPACK_COMPONENTS_IGNORE_GROUPS 1) set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") -set(CPACK_COMPONENT_EXECUTABLE_REQUIRED TRUE) -set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) -set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE) +set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) +set(CPACK_RPM_LIBRARY_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable") -set(CPACK_COMPONENT_LIBRARY_GROUP "executable") -set(CPACK_COMPONENT_PROFILE_GROUP "executable") +set(CPACK_COMPONENT_LIBRARY_GROUP "library") +set(CPACK_COMPONENT_PROFILE_GROUP "library") set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") @@ -45,7 +44,7 @@ set(CPACK_COMPONENT_HEADER_GROUP "header") set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME}) set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) -set(CPACK_COMPONENTS_ALL LIBRARY HEADER EXECUTABLE PROFILE) +set(CPACK_COMPONENTS_ALL LIBRARY HEADER PROFILE) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") |