gfwleak/vendor-rdkafka
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-install-error' into 'master'

Browse Source 
构造rpm包时缺少librdkafka.so.1, 头文件安装路径不正确

See merge request vendor/rdkafka!1
This commit is contained in:
刘学利
2021-09-11 06:49:37 +00:00
parent 44235b7ec5 4ade0ab085
commit 4b8dd6d069
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -24,7 +24,7 @@ ExternalProject_Add(${lib_name}
ExternalProject_Get_Property(${lib_name} SOURCE_DIR) ExternalProject_Get_Property(${lib_name} SOURCE_DIR)
install(FILES ${SOURCE_DIR}/src/rdkafka.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA/ COMPONENT HEADER) install(FILES ${SOURCE_DIR}/src/rdkafka.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA/librdkafka COMPONENT HEADER)
install(FILES ${SOURCE_DIR}/src/librdkafka.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES) install(FILES ${SOURCE_DIR}/src/librdkafka.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
install(FILES ${SOURCE_DIR}/src/librdkafka.so.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
include(Package) include(Package)

3
cmake/Package.cmake
View File

@@ -57,5 +57,8 @@ set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
# Must uninstall the debug package before install release package # Must uninstall the debug package before install release package
set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX}) set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX})
set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
set(CPACK_RPM_PACKAGE_AUTOREQ "no")
# set(CPACK_STRIP_FILES TRUE) # set(CPACK_STRIP_FILES TRUE)
include(CPack) include(CPack)