fix debian compile error
This commit is contained in:
xibowen
parent
e614444d03
commit
ac0fcd486a
|
|
@ -30,6 +30,6 @@ set (LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
|
|||
set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
|
||||
|
||||
set (CMAKE_INSTALL_PREFIX /usr)
|
||||
set (CMAKE_INSTALL_RPATH /usr/lib/kysdk/kysdk-base)
|
||||
set (CMAKE_INSTALL_RPATH /usr/lib/x86_64-linux-gnu/kysdk/kysdk-base)
|
||||
|
||||
add_subdirectory(src)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
libkysdk-base (1.2.0.5kylin1-ok1~0715) yangtze; urgency=medium
|
||||
libkysdk-base (1.2.0.5kylin1-ok1~0715) sid; urgency=medium
|
||||
|
||||
* 合并主线v1.2
|
||||
* update v1.2
|
||||
|
|
|
|||
|
|
@ -1,68 +1,139 @@
|
|||
Source: libkysdk-base
|
||||
Section: utils
|
||||
Section: libs
|
||||
Priority: optional
|
||||
Maintainer: kylin <chenzhikai@kylinos.cn>
|
||||
Build-Depends: debhelper-compat (= 12),
|
||||
libc6-dev,
|
||||
cmake,
|
||||
libsystemd-dev,
|
||||
libdbus-1-dev,
|
||||
libssl-dev
|
||||
Standards-Version: 4.4.1
|
||||
Rules-Requires-Root: no
|
||||
Homepage: http://gitlab2.kylin.com/kysdk/kysdk-base
|
||||
|
||||
Package: libkysdk-base
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-timer,
|
||||
libkysdk-log,
|
||||
libkysdk-config,
|
||||
libkysdk-log,
|
||||
libkysdk-utils,
|
||||
libkysdk-diagnostics,
|
||||
libkysdk-basecommon
|
||||
Multi-Arch: same
|
||||
Description: 麒麟开发者套件 - 基础层套件，提供日志管理、消息通信、进程守护、线程管理、定时器、调试与埋点、配置文件、utils
|
||||
Description: Basic libraries of ukui
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package is metapackage.It provides the kysdk shared basic libraries.
|
||||
|
||||
Package: libkysdk-base-dev
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-base,
|
||||
libkysdk-timer-dev,
|
||||
libkysdk-log-dev,
|
||||
libkysdk-config-dev,
|
||||
libkysdk-log-dev,
|
||||
libkysdk-utils-dev,
|
||||
libkysdk-diagnostics-dev
|
||||
Multi-Arch: same
|
||||
Description: 麒麟开发者套件 - 基础层套件 - 开发库，提供日志管理、消息通信、进程守护、线程管理、定时器、调试与埋点、配置文件、utils
|
||||
Description: Development suite of ukui - base suite
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package provides the development files of libkysdk-base.
|
||||
|
||||
|
||||
Package: libkysdk-basecommon
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Multi-Arch: same
|
||||
Description: kysdk-base basic package
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package provides common interface for other libkysdk libraries.
|
||||
|
||||
|
||||
Package: libkysdk-timer
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends} ,
|
||||
libkysdk-basecommon,
|
||||
libkysdk-utils
|
||||
Multi-Arch: same
|
||||
Description: 定制器模块库
|
||||
Description: Timer lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains a timer libraries needed by kysdk
|
||||
|
||||
Package: libkysdk-timer-dev
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-utils-dev,
|
||||
libkysdk-timer,
|
||||
libkysdk-basecommon
|
||||
Multi-Arch: same
|
||||
Description: 定时器模块 - 开发库
|
||||
Description: Timer module - development lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains the timer development files for the timer libraries.
|
||||
|
||||
|
||||
Package: libkysdk-config
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-basecommon,
|
||||
libkysdk-utils
|
||||
Multi-Arch: same
|
||||
Description: Config file lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains a config file libraries needed by kysdk
|
||||
|
||||
|
||||
Package: libkysdk-config-dev
|
||||
Architecture: any
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-utils-dev,
|
||||
libkysdk-config
|
||||
Multi-Arch: same
|
||||
Description: Config module - development lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains the config file development files for the
|
||||
config file libraries.
|
||||
|
||||
|
||||
Package: libkysdk-log
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-config,
|
||||
|
|
@ -70,19 +141,17 @@ Depends: ${shlibs:Depends},
|
|||
libkysdk-basecommon,
|
||||
libkysdk-utils
|
||||
Multi-Arch: same
|
||||
Description: 日志库
|
||||
|
||||
Package: libkysdk-basecommon
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Multi-Arch: same
|
||||
Description: kysdk-base层公用数据包
|
||||
Description: Log lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains a log libraries needed by kysdk
|
||||
|
||||
Package: libkysdk-log-dev
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-log,
|
||||
|
|
@ -90,61 +159,74 @@ Depends: ${shlibs:Depends},
|
|||
libkysdk-utils-dev,
|
||||
libsystemd-dev
|
||||
Multi-Arch: same
|
||||
Description: 日志库 - 开发库
|
||||
Description: Log module - development lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains the log development files for the log libraries.
|
||||
|
||||
Package: libkysdk-config
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-basecommon,
|
||||
libkysdk-utils
|
||||
Multi-Arch: same
|
||||
Description: 配置文件库
|
||||
|
||||
Package: libkysdk-config-dev
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-utils-dev,
|
||||
libkysdk-config
|
||||
Multi-Arch: same
|
||||
Description: 配置文件库 - 开发库
|
||||
|
||||
Package: libkysdk-utils
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-basecommon
|
||||
Multi-Arch: same
|
||||
Description: 开发者utils
|
||||
Description: Development utils
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains a utils libraries needed by kysdk
|
||||
|
||||
|
||||
Package: libkysdk-utils-dev
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-utils
|
||||
Multi-Arch: same
|
||||
Description: 开发者utils - 开发库
|
||||
Description: Utils module - development lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains the utils development files for the utils libraries.
|
||||
|
||||
|
||||
Package: libkysdk-diagnostics
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-basecommon,
|
||||
libkysdk-utils
|
||||
Multi-Arch: same
|
||||
Description: 开发者diagnostics
|
||||
Description: Diagnostics lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains a diagnostics libraries needed by kysdk
|
||||
|
||||
|
||||
Package: libkysdk-diagnostics-dev
|
||||
Architecture: any
|
||||
Section: utils
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libkysdk-diagnostics
|
||||
Multi-Arch: same
|
||||
Description: 开发者diagnostics - 开发库
|
||||
Description: Diagnostics module - development lib
|
||||
Libkysdk-base is basic libraries for the UKUI desktop environment.
|
||||
It provides various interface for application to unify function and
|
||||
UI-UE style, including log management, message communication, process
|
||||
daemon, thread management, timer, debugging, config file, utils.
|
||||
.
|
||||
This package contains the diagnostics development files for the
|
||||
diagnostics libraries.
|
||||
|
|
|
|||
|
|
@ -1,21 +1,16 @@
|
|||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: kysdk-base
|
||||
Upstream-Contact: <preferred name and address to reach the upstream project>
|
||||
Source: <url://example.com>
|
||||
Upstream-Name: libkysdk-base
|
||||
Upstream-Contact: Kylin Team <ukui@kylinos.cn>
|
||||
Source: <https://gitee.com/openkylin/libkysdk-base>
|
||||
|
||||
Files: *
|
||||
Copyright: <years> <put author's name and email here>
|
||||
<years> <likewise for another author>
|
||||
License: <special license>
|
||||
<Put the license of the package here indented by 1 space>
|
||||
<This follows the format of Description: lines in control file>
|
||||
.
|
||||
<Including paragraphs>
|
||||
Copyright: 2022 kylin <chenzhikai@kylinos.cn>
|
||||
License: GPL-2+
|
||||
|
||||
# If you want to use GPL v2 or later for the /debian/* files use
|
||||
# the following clauses, or change it to suit. Delete these two lines
|
||||
Files: debian/*
|
||||
Copyright: 2021 kylin <chenzhikai@kylinos.cn>
|
||||
Copyright: 2022 kylin <chenzhikai@kylinos.cn>
|
||||
License: GPL-2+
|
||||
|
||||
License: GPL-2+
|
||||
This package is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -32,12 +27,3 @@ License: GPL-2+
|
|||
.
|
||||
On Debian systems, the complete text of the GNU General
|
||||
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
||||
|
||||
# Please also look if there are files or directories which have a
|
||||
# different copyright/license attached and list them here.
|
||||
# Please avoid picking licenses with terms that are more restrictive than the
|
||||
# packaged work, as it may make Debian's contributions unacceptable upstream.
|
||||
#
|
||||
# If you need, there are some extra license texts available in two places:
|
||||
# /usr/share/debhelper/dh_make/licenses/
|
||||
# /usr/share/common-licenses/
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
usr/lib/kysdk/kysdk-base/libkyconf.so*
|
||||
usr/lib/*/kysdk/kysdk-base/libkyconf.so*
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
usr/lib/kysdk/kysdk-base/libkydiagnostics.so*
|
||||
usr/lib/*/kysdk/kysdk-base/libkydiagnostics.so*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
src/log/kylog-default.conf etc/kysdk/kysdk-base
|
||||
src/log/kylog-rotate-default etc/kysdk/kysdk-base
|
||||
src/log/logrotate.cron etc/kysdk/kysdk-base
|
||||
usr/lib/kysdk/kysdk-base/libkylog.so*
|
||||
usr/lib/*/kysdk/kysdk-base/*.so*
|
||||
#usr/lib/*/kysdk/kysdk-base/libkylog.so*
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
usr/lib/kysdk/kysdk-base/libkytimer.so*
|
||||
usr/lib/*/kysdk/kysdk-base/libkytimer.so*
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
usr/lib/kysdk/kysdk-base/libkydatastruct.so*
|
||||
usr/lib/kysdk/kysdk-base/libkyutils.so*
|
||||
usr/lib/*/kysdk/kysdk-base/*.so*
|
||||
#usr/lib/*/kysdk/kysdk-base/libkydatastruct.so*
|
||||
#usr/lib/*/kysdk/kysdk-base/libkyutils.so*
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
From: cckylin-cibot <cckylin-cibot@kylinos.cn>
|
||||
Date: Mon, 27 Jun 2022 03:50:30 +0000
|
||||
Subject: =?utf-8?b?Zml4IGJ1ZyMxMjU0NTMs5o6n5Yi26Z2i5p2/6LSm5oi35qih5Z2X57y6?=
|
||||
=?utf-8?b?5bCRIui0puaIt+S/oeaBryLorr7nva7pobk=?=
|
||||
|
||||
---
|
||||
src/config/CMakeLists.txt | 1 +
|
||||
src/log/CMakeLists.txt | 1 +
|
||||
src/timer/CMakeLists.txt | 1 +
|
||||
src/utils/data-structure/CMakeLists.txt | 1 +
|
||||
4 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
|
||||
index 391b2ce..f95567a 100644
|
||||
--- a/src/config/CMakeLists.txt
|
||||
+++ b/src/config/CMakeLists.txt
|
||||
@@ -1,5 +1,6 @@
|
||||
aux_source_directory(. SOURCESCODE)
|
||||
add_library(kyconf SHARED ${SOURCESCODE})
|
||||
+set_target_properties(kyconf PROPERTIES VERSION 1.2.0 SOVERSION 1)
|
||||
add_executable(kyconf-test-struct test/test_structlist.c)
|
||||
target_link_libraries(kyconf-test-struct kyconf kylog pthread)
|
||||
|
||||
diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt
|
||||
index 34e400c..4f94825 100644
|
||||
--- a/src/log/CMakeLists.txt
|
||||
+++ b/src/log/CMakeLists.txt
|
||||
@@ -1,5 +1,6 @@
|
||||
aux_source_directory(. SOURCESCODE)
|
||||
add_library(kylog SHARED ${SOURCESCODE})
|
||||
+set_target_properties(kylog PROPERTIES VERSION 1.2.0 SOVERSION 1)
|
||||
add_executable(kylog-testlog test/test-log.c)
|
||||
add_executable(kylog-testsetdir test/test-setdir.c)
|
||||
add_executable(kylog-testpressure test/test-pressure.c)
|
||||
diff --git a/src/timer/CMakeLists.txt b/src/timer/CMakeLists.txt
|
||||
index 259e47d..a3bee3f 100644
|
||||
--- a/src/timer/CMakeLists.txt
|
||||
+++ b/src/timer/CMakeLists.txt
|
||||
@@ -1,5 +1,6 @@
|
||||
aux_source_directory(. SOURCESCODE)
|
||||
add_library(kytimer SHARED ${SOURCESCODE})
|
||||
+set_target_properties(kytimer PROPERTIES VERSION 1.2.0 SOVERSION 1)
|
||||
add_executable(test-kytimer test/test-kytimer.c)
|
||||
target_link_libraries(kytimer pthread)
|
||||
target_link_libraries(test-kytimer kytimer)
|
||||
diff --git a/src/utils/data-structure/CMakeLists.txt b/src/utils/data-structure/CMakeLists.txt
|
||||
index c8fe306..5ace007 100644
|
||||
--- a/src/utils/data-structure/CMakeLists.txt
|
||||
+++ b/src/utils/data-structure/CMakeLists.txt
|
||||
@@ -1,5 +1,6 @@
|
||||
aux_source_directory(linklist/skip_linklist SOURCESCODE)
|
||||
add_library(kydatastruct SHARED ${SOURCESCODE})
|
||||
+set_target_properties(kydatastruct PROPERTIES VERSION 1.2.0 SOVERSION 1)
|
||||
|
||||
add_subdirectory(linklist)
|
||||
|
||||
|
|
@ -1,25 +1,9 @@
|
|||
#!/usr/bin/make -f
|
||||
# See debhelper(7) (uncomment to enable)
|
||||
# output every command that modifies files on the build system.
|
||||
#export DH_VERBOSE = 1
|
||||
|
||||
|
||||
# see FEATURE AREAS in dpkg-buildflags(1)
|
||||
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
# see ENVIRONMENT in dpkg-buildflags(1)
|
||||
# package maintainers to append CFLAGS
|
||||
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
|
||||
# package maintainers to append LDFLAGS
|
||||
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
|
||||
|
||||
export QT_SELECT=5
|
||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
|
||||
# dh_make generated override targets
|
||||
# This is example for Cmake (See https://bugs.debian.org/641051 )
|
||||
#override_dh_auto_configure:
|
||||
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
|
||||
|
||||
override_dh_makeshlibs:
|
||||
:
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.0 (native)
|
||||
3.0 (quilt)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
version=4
|
||||
https://github.com/ukui/kylin-nm/releases .*/libkysdk-base_(\d\S+)\.orig\.tar\.gz
|
||||
|
|
@ -1 +1 @@
|
|||
/usr/lib/kysdk/kysdk-base
|
||||
/usr/lib/*/kysdk/kysdk-base
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ Description: kysdk base layer config component
|
|||
Requires: kysdk-utils
|
||||
Version: 1.2.0
|
||||
Cflags: -I/usr/include/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/kysdk/kysdk-base/ -lkyconf -Wl,-rpath=/usr/lib/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkyconf -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ Name: libkysdk-diagnostics
|
|||
Description: kysdk base layer diagnostics component
|
||||
Version: 1.2.0
|
||||
Cflags: -I/usr/include/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/kysdk/kysdk-base/ -lkydiagnostics -Wl,-rpath=/usr/lib/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkydiagnostics -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ Description: kysdk base layer log component
|
|||
Requires: kysdk-config kysdk-utils libsystemd
|
||||
Version: 1.2.0
|
||||
Cflags: -I/usr/include/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/kysdk/kysdk-base/ -lkylog -Wl,-rpath=/usr/lib/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkylog -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ Description: kysdk base layer time component
|
|||
Requires: kysdk-utils
|
||||
Version: 1.2.0
|
||||
Cflags: -I/usr/include/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/kysdk/kysdk-base/ -lkytimer -Wl,-rpath=/usr/lib/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkytimer -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ Name: libkysdk-utils
|
|||
Description: kysdk base layer utils component
|
||||
Version: 1.2.0
|
||||
Cflags:-I/usr/include/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/kysdk/kysdk-base/ -lkydatastruct -lkyutils -Wl,-rpath=/usr/lib/kysdk/kysdk-base/
|
||||
Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkydatastruct -lkyutils -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ add_executable(kyconf-test-struct test/test_structlist.c)
|
|||
target_link_libraries(kyconf-test-struct kyconf kylog pthread)
|
||||
|
||||
install(TARGETS kyconf
|
||||
DESTINATION lib/kysdk/kysdk-base)
|
||||
DESTINATION lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/kysdk/kysdk-base)
|
||||
|
||||
# install(FILES libkyconf.h
|
||||
# DESTINATION include/kysdk/kysdk-base)
|
||||
|
|
@ -30,4 +30,4 @@ 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)
|
||||
install(TARGETS ${PROJECT_NAME} DESTINATION lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/kysdk/kysdk-base)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ target_link_libraries(kylog-testautowrap kylog)
|
|||
target_link_libraries(kylog-testpressure kylog)
|
||||
|
||||
install(TARGETS kylog
|
||||
DESTINATION lib/kysdk/kysdk-base)
|
||||
DESTINATION lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/kysdk/kysdk-base)
|
||||
|
||||
install(FILES libkylog.h
|
||||
DESTINATION include/kysdk/kysdk-base)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ target_link_libraries(kytimer pthread)
|
|||
target_link_libraries(test-kytimer kytimer)
|
||||
|
||||
install(TARGETS kytimer
|
||||
DESTINATION lib/kysdk/kysdk-base)
|
||||
DESTINATION lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/kysdk/kysdk-base)
|
||||
|
||||
# install(FILES libkytimer.h
|
||||
# DESTINATION include/kysdk/kysdk-base)
|
||||
|
|
@ -3,7 +3,7 @@ add_library(kyutils SHARED ${SOURCESCODE})
|
|||
set_target_properties(kyutils PROPERTIES VERSION 1.2.0 SOVERSION 1)
|
||||
include_directories(.)
|
||||
install(TARGETS kyutils
|
||||
DESTINATION lib/kysdk/kysdk-base)
|
||||
DESTINATION lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/kysdk/kysdk-base)
|
||||
# install(FILES sdkmarcos.h kerr.h cstring-extension.h
|
||||
# DESTINATION include/kysdk/kysdk-base)
|
||||
add_executable(test-utils sample/kyutils_sample.c)
|
||||
|
|
|
|||
Loading…
Reference in New Issue