summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuxueli <[email protected]>2022-03-01 13:08:19 +0800
committerliuxueli <[email protected]>2022-03-01 13:08:19 +0800
commitc701bdc7e1bc4ebcd32a54aba23938359a5bb437 (patch)
tree582efab561ca49fe891d458ca4420e3da78bfd5c
parent63ffb1df8c30771cb9615f4f37f213eaf56ae940 (diff)
修复在Rocky linux8.5使用RelWithDebInfo编译不生成debuginfo的问题v2.10.4
-rwxr-xr-xCMakeLists.txt4
-rw-r--r--cmake/Package.cmake10
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29ed48a..0e39e68 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,8 +53,8 @@ endif()
add_library(${lib_name}_static STATIC ${SRC})
set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name})
-install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
-install(TARGETS ${lib_name}_static LIBRARY ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
+install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
+install(TARGETS ${lib_name}_static LIBRARY ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
install(FILES inc/field_stat2.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
include(Package)
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 0867f36..909001b 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -28,18 +28,18 @@ 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_COMPONENT_LIBRARY_GROUP "library")
+set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
+set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_COMPONENT_LIBRARIES_GROUP "LIBRARIES")
set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
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)
+set(CPACK_COMPONENTS_ALL LIBRARIES HEADER)
set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")