73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
From dac58c31518f990ffc20735de250a527d47e05ef Mon Sep 17 00:00:00 2001
|
|
From: peijiankang <peijiankang@kylinos.cn>
|
|
Date: Wed, 2 Nov 2022 18:46:02 +0800
|
|
Subject: [PATCH] fix compile error of libkysdk-base
|
|
|
|
---
|
|
src/config/CMakeLists.txt | 6 +++---
|
|
src/log/CMakeLists.txt | 4 ++--
|
|
src/timer/CMakeLists.txt | 4 ++--
|
|
src/utils/CMakeLists.txt | 4 ++--
|
|
4 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
|
|
index 391b2ce..bcdde51 100644
|
|
--- a/src/config/CMakeLists.txt
|
|
+++ b/src/config/CMakeLists.txt
|
|
@@ -1,10 +1,10 @@
|
|
aux_source_directory(. SOURCESCODE)
|
|
add_library(kyconf SHARED ${SOURCESCODE})
|
|
add_executable(kyconf-test-struct test/test_structlist.c)
|
|
-target_link_libraries(kyconf-test-struct kyconf kylog pthread)
|
|
+target_link_libraries(kyconf-test-struct kyconf kylog pthread systemd)
|
|
|
|
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/log/CMakeLists.txt b/src/log/CMakeLists.txt
|
|
index a0a0b80..292dbde 100644
|
|
--- a/src/log/CMakeLists.txt
|
|
+++ b/src/log/CMakeLists.txt
|
|
@@ -15,5 +15,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 47aa10e..bb949b4 100644
|
|
--- a/src/timer/CMakeLists.txt
|
|
+++ b/src/timer/CMakeLists.txt
|
|
@@ -6,5 +6,5 @@ target_link_libraries(test-kytimer kytimer pthread)
|
|
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 b7123c4..d0274df 100644
|
|
--- a/src/utils/CMakeLists.txt
|
|
+++ b/src/utils/CMakeLists.txt
|
|
@@ -1,4 +1,4 @@
|
|
add_subdirectory(data-structure)
|
|
|
|
-# install(FILES sdkmarcos.h kerr.h cstring-extension.h
|
|
-# DESTINATION include/kysdk/kysdk-base)
|
|
\ No newline at end of file
|
|
+install(FILES sdkmarcos.h kerr.h cstring-extension.h
|
|
+ DESTINATION include/kysdk/kysdk-base)
|
|
--
|
|
2.36.1
|
|
|