diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cmake/Package.cmake | 2 | ||||
| -rw-r--r-- | cmake/PostInstall.in | 2 | ||||
| -rw-r--r-- | zlog/CMakeLists.txt | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 689a8fb..b59a437 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,8 +57,10 @@ set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name}) set(CMAKE_INSTALL_PREFIX /opt/MESA) -install(TARGETS ${lib_name}_shared LIBRARY DESTINATION - ${CMAKE_INSTALL_PREFIX}/lib) +install(FILES inc/MESA_handle_logger.h DESTINATION + ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel) +install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES) +install(FILES inc/MESA_handle_logger.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ @@ -67,10 +69,6 @@ install(CODE "execute_process( \ )" ) -install(FILES inc/MESA_handle_logger.h DESTINATION - ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel) -install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES) -install(FILES inc/MESA_handle_logger.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 236d639..d25d86c 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -45,6 +45,8 @@ set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE) +set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in) +set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in new file mode 100644 index 0000000..d574bbe --- /dev/null +++ b/cmake/PostInstall.in @@ -0,0 +1,2 @@ +#!/bin/sh +ldconfig
\ No newline at end of file diff --git a/zlog/CMakeLists.txt b/zlog/CMakeLists.txt index 574e936..29c41a0 100644 --- a/zlog/CMakeLists.txt +++ b/zlog/CMakeLists.txt @@ -19,6 +19,6 @@ add_dependencies(zlog_shared zlog) set_property(TARGET zlog_shared PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.so) set_property(TARGET zlog_shared PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src) - +install(FILES ${SOURCE_DIR}/src/libzlog.so DESTINATION lib COMPONENT LIBRARIES) +install(CODE "execute_process(COMMAND ldconfig)") install(PROGRAMS ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE) -install(PROGRAMS ${SOURCE_DIR}/src/libzlog.so DESTINATION lib COMPONENT LIBRARIES) |