From f9bac0008b7d124c0607f6e026fff309b8eb86ac Mon Sep 17 00:00:00 2001 From: peijiankang Date: Tue, 29 Nov 2022 17:11:39 +0800 Subject: [PATCH] fix compile error of libkysdk-base --- CMakeLists.txt | 8 +++++++- src/config/CMakeLists.txt | 4 ++-- src/diagnostics/CMakeLists.txt | 5 ++++- src/log/CMakeLists.txt | 4 ++-- src/timer/CMakeLists.txt | 4 ++-- src/utils/CMakeLists.txt | 6 +++--- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b77bb78..535b4be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,4 +32,10 @@ set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) set (CMAKE_INSTALL_PREFIX /usr) set (CMAKE_INSTALL_RPATH /usr/lib/kysdk/kysdk-base) -add_subdirectory(src) \ No newline at end of file +add_subdirectory(src) + +install(FILES development-files/kysdk-base.conf + DESTINATION /etc/ld.so.conf.d) + +install(FILES development-files/kysdk-base.pc development-files/kysdk-config.pc development-files/kysdk-diagnostics.pc development-files/kysdk-log.pc development-files/kysdk-timer.pc development-files/kysdk-utils.pc + DESTINATION share/pkgconfig) diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt index f95567a..a62f66e 100644 --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries(kyconf-test-struct kyconf kylog pthread) install(TARGETS kyconf DESTINATION lib/kysdk/kysdk-base) -# install(FILES libkyconf.h -# DESTINATION include/kysdk/kysdk-base) \ No newline at end of file +install(FILES libkyconf.h + DESTINATION include/kysdk/kysdk-base) diff --git a/src/diagnostics/CMakeLists.txt b/src/diagnostics/CMakeLists.txt index ae7544b..cff6f70 100644 --- a/src/diagnostics/CMakeLists.txt +++ b/src/diagnostics/CMakeLists.txt @@ -30,4 +30,7 @@ set(SRCS target_include_directories(${PROJECT_NAME} PRIVATE ${DIAGNOSTICS_TOP_DIR}) target_sources(${PROJECT_NAME} PRIVATE ${SRCS}) -install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-base) \ No newline at end of file +install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-base) + +install(FILES libkydiagnostics.h + DESTINATION include/kysdk/kysdk-base) diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt index 4f94825..f9e2e1a 100644 --- a/src/log/CMakeLists.txt +++ b/src/log/CMakeLists.txt @@ -18,5 +18,5 @@ install(TARGETS kylog install(FILES libkylog.h DESTINATION include/kysdk/kysdk-base) -install(FILES kylog-rotate-default - DESTINATION /etc/kysdk/kysdk-base) \ No newline at end of file +install(FILES kylog-rotate-default kylog-default.conf logrotate.cron + DESTINATION /etc/kysdk/kysdk-base) diff --git a/src/timer/CMakeLists.txt b/src/timer/CMakeLists.txt index a3bee3f..39197f1 100644 --- a/src/timer/CMakeLists.txt +++ b/src/timer/CMakeLists.txt @@ -8,5 +8,5 @@ target_link_libraries(test-kytimer kytimer) install(TARGETS kytimer DESTINATION lib/kysdk/kysdk-base) -# install(FILES libkytimer.h -# DESTINATION include/kysdk/kysdk-base) \ No newline at end of file +install(FILES libkytimer.h + DESTINATION include/kysdk/kysdk-base) diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 739003a..ec1c9b4 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -4,9 +4,9 @@ set_target_properties(kyutils PROPERTIES VERSION 1.2.0 SOVERSION 1) include_directories(.) install(TARGETS kyutils DESTINATION lib/kysdk/kysdk-base) -# install(FILES sdkmarcos.h kerr.h cstring-extension.h -# DESTINATION include/kysdk/kysdk-base) +install(FILES sdkmarcos.h kerr.h cstring-extension.h kyutils.h + DESTINATION include/kysdk/kysdk-base) add_executable(test-utils sample/kyutils_sample.c) target_link_libraries(test-utils kyutils) -add_subdirectory(data-structure) \ No newline at end of file +add_subdirectory(data-structure) -- 2.36.1