diff options
| author | liuxueli <[email protected]> | 2020-09-02 14:42:22 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-09-02 14:42:22 +0800 |
| commit | a73f9564207ed0ea4884a24b9dd7c8a4567281ac (patch) | |
| tree | 709ce9e6a49e782ca11d8f3373ba17a1110fa852 | |
| parent | b18d3cfcf6d9e836e3921900008929d1ed5ed0bd (diff) | |
修复编译debuginfo出错的问题v3.2.4.20.09
| -rw-r--r-- | cmake/Package.cmake | 16 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index edb4258..c69fec4 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -30,13 +30,13 @@ set(CPACK_COMPONENTS_IGNORE_GROUPS 1) set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") -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_LIBRARIES_REQUIRED TRUE) +set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) +set(CPACK_RPM_LIBRARIES_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_COMPONENT_LIBRARY_GROUP "library") -set(CPACK_COMPONENT_PROFILE_GROUP "library") +set(CPACK_COMPONENT_PROFILE_GROUP "libraries") +set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries") set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") @@ -44,10 +44,10 @@ set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_COMPONENT_HEADER_GROUP "header") -set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME}) +set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME}) set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) -set(CPACK_COMPONENTS_ALL LIBRARY HEADER PROFILE) +set(CPACK_COMPONENTS_ALL HEADER PROFILE LIBRARIES) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d4a8351..514c958 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,5 +16,5 @@ set_target_properties(tsg_master PROPERTIES LINK_FLAGS "-Wl,--version-script=${P target_link_libraries(tsg_master ${TSG_MASTER_DEPEND_DYN_LIB}) set_target_properties(tsg_master PROPERTIES PREFIX "") -install(TARGETS tsg_master LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/platform/tsg_master COMPONENT LIBRARY) +install(TARGETS tsg_master LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/platform/tsg_master COMPONENT LIBRARIES) install(FILES ../bin/tsg_master.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/platform/tsg_master COMPONENT PROFILE) |