124 lines
5.9 KiB
Diff
124 lines
5.9 KiB
Diff
From 372944e4a6ef23342bc3cb12d72231ff81d3dc2e Mon Sep 17 00:00:00 2001
|
|
From: peijiankang <peijiankang@kylinos.cn>
|
|
Date: Wed, 2 Nov 2022 19:43:28 +0800
|
|
Subject: [PATCH] fix compile error of libkysdk-applications
|
|
|
|
---
|
|
development-files/kysdk-kabase.pc | 2 +-
|
|
development-files/kysdk-qtwidgets.pc | 2 +-
|
|
development-files/kysdk-widgetutils.pc | 2 +-
|
|
kysdk-kabase/kabase/kabase.pro | 14 ++++++++++++++
|
|
kysdk-qtwidgets/kysdk-qtwidgets.pro | 10 +++++++++-
|
|
kysdk-widgetutils/kysdk-widgetutils.pro | 8 ++++++--
|
|
.../build-testWidgetutils-unknown-Debug/Makefile | 2 +-
|
|
7 files changed, 33 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/development-files/kysdk-kabase.pc b/development-files/kysdk-kabase.pc
|
|
index 3f32fb3..b96b997 100644
|
|
--- a/development-files/kysdk-kabase.pc
|
|
+++ b/development-files/kysdk-kabase.pc
|
|
@@ -2,4 +2,4 @@ Name: libkysdk-kabase
|
|
Description: Application general interface
|
|
Version: 1.0.0
|
|
Cflags: -I/usr/include/kysdk/applications/kabase/
|
|
-Libs: -L/usr/libs/kysdk/applications/ -lkysdk-kabase -Wl,-rpath=/usr/libs/kysdk/applications/
|
|
+Libs: -L/usr/lib/kysdk/applications/ -lkysdk-kabase -Wl,-rpath=/usr/lib/kysdk/applications/
|
|
diff --git a/development-files/kysdk-qtwidgets.pc b/development-files/kysdk-qtwidgets.pc
|
|
index c17b7c2..b123e2f 100644
|
|
--- a/development-files/kysdk-qtwidgets.pc
|
|
+++ b/development-files/kysdk-qtwidgets.pc
|
|
@@ -2,5 +2,5 @@ Name: libkysdk-qtwidgets
|
|
Description: KYSDK-gui
|
|
Requires: Qt5Widgets >= 5.12.1 gsettings-qt
|
|
Version: 1.0.0
|
|
-Libs: -L/ -L/usr/libs/kysdk/applications/ -lkysdk-qtwidgets -Wl,-rpath=/usr/libs/kysdk/applications/
|
|
+Libs: -L/ -L/usr/lib/kysdk/applications/ -lkysdk-qtwidgets -Wl,-rpath=/usr/lib/kysdk/applications/
|
|
Cflags: -I/usr/include/kysdk/applications/
|
|
diff --git a/development-files/kysdk-widgetutils.pc b/development-files/kysdk-widgetutils.pc
|
|
index a26df80..8b76ebc 100644
|
|
--- a/development-files/kysdk-widgetutils.pc
|
|
+++ b/development-files/kysdk-widgetutils.pc
|
|
@@ -2,5 +2,5 @@ Name: libkysdk-widgetutils
|
|
Description: KYSDK-gui
|
|
Requires: Qt5Widgets >= 5.12.1 gsettings-qt
|
|
Version: 1.0.0
|
|
-Libs: -L/ -L/usr/libs/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/libs/kysdk/applications/
|
|
+Libs: -L/ -L/usr/lib/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/lib/kysdk/applications/
|
|
Cflags: -I/usr/include/kysdk/applications/
|
|
diff --git a/kysdk-kabase/kabase/kabase.pro b/kysdk-kabase/kabase/kabase.pro
|
|
index e92bf08..6e5005e 100644
|
|
--- a/kysdk-kabase/kabase/kabase.pro
|
|
+++ b/kysdk-kabase/kabase/kabase.pro
|
|
@@ -41,3 +41,17 @@ QT += x11extras KWindowSystem
|
|
LIBS +=-lpthread
|
|
LIBS +=-lX11
|
|
LIBS +=-lpeony
|
|
+
|
|
+# Default rules for deployment.
|
|
+!isEmpty(target.path): INSTALLS += target
|
|
+unix {
|
|
+ target.path = /usr/lib/kysdk/applications/
|
|
+ config.files += ../../development-files/kysdk-kabase.pc
|
|
+ config.path = /usr/share/pkgconfig
|
|
+ include.files += *.hpp kylin_system/*.hpp
|
|
+ include.path = /usr/include/kysdk/applications/kabase
|
|
+ log.files += ../config/log/kabase-log.conf
|
|
+ log.path = /etc/kysdk/kysdk-applications/kabase/
|
|
+}
|
|
+!isEmpty(target.path): INSTALLS += target config include log
|
|
+
|
|
diff --git a/kysdk-qtwidgets/kysdk-qtwidgets.pro b/kysdk-qtwidgets/kysdk-qtwidgets.pro
|
|
index 72c8736..0d08dfa 100644
|
|
--- a/kysdk-qtwidgets/kysdk-qtwidgets.pro
|
|
+++ b/kysdk-qtwidgets/kysdk-qtwidgets.pro
|
|
@@ -96,7 +96,15 @@ HEADERS += \
|
|
src/xatom-helper.h \
|
|
|
|
# Default rules for deployment.
|
|
-!isEmpty(target.path): INSTALLS += target
|
|
+unix {
|
|
+ target.path = /usr/lib/kysdk/applications
|
|
+ config.files += ../development-files/kysdk-qtwidgets.pc
|
|
+ config.path = /usr/share/pkgconfig
|
|
+ include.files += src/*.h
|
|
+ include.path = /usr/include/kysdk/applications/
|
|
+ }
|
|
+!isEmpty(target.path): INSTALLS += target config include
|
|
+
|
|
|
|
RESOURCES += \
|
|
res.qrc
|
|
diff --git a/kysdk-widgetutils/kysdk-widgetutils.pro b/kysdk-widgetutils/kysdk-widgetutils.pro
|
|
index 7aaad6c..95a4139 100644
|
|
--- a/kysdk-widgetutils/kysdk-widgetutils.pro
|
|
+++ b/kysdk-widgetutils/kysdk-widgetutils.pro
|
|
@@ -25,6 +25,10 @@ HEADERS += \
|
|
|
|
# Default rules for deployment.
|
|
unix {
|
|
- target.path = /usr/lib
|
|
+ target.path = /usr/lib/kysdk/applications/
|
|
+ config.files += ../development-files/kysdk-widgetutils.pc
|
|
+ config.path = /usr/share/pkgconfig
|
|
+ include.files += src/*.h
|
|
+ include.path = /usr/include/kysdk/applications/
|
|
}
|
|
-!isEmpty(target.path): INSTALLS += target
|
|
+!isEmpty(target.path): INSTALLS += target config include
|
|
diff --git a/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile b/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile
|
|
index f13bb76..6bd9168 100644
|
|
--- a/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile
|
|
+++ b/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile
|
|
@@ -40,7 +40,7 @@ DISTNAME = testWidgetutils1.0.0
|
|
DISTDIR = /home/sunzhen/bianbao/kysdk-application1.0.0kylin8/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/.tmp/testWidgetutils1.0.0
|
|
LINK = g++
|
|
LFLAGS =
|
|
-LIBS = $(SUBLIBS) -L/ -L/usr/libs/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/libs/kysdk/applications/ -lQt5Widgets -lQt5Gui -lQt5Core -lgsettings-qt /usr/lib/aarch64-linux-gnu/libQt5Widgets.so /usr/lib/aarch64-linux-gnu/libQt5Gui.so /usr/lib/aarch64-linux-gnu/libQt5Core.so /usr/lib/aarch64-linux-gnu/libGL.so -lpthread
|
|
+LIBS = $(SUBLIBS) -L/ -L/usr/lib/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/lib/kysdk/applications/ -lQt5Widgets -lQt5Gui -lQt5Core -lgsettings-qt /usr/lib/aarch64-linux-gnu/libQt5Widgets.so /usr/lib/aarch64-linux-gnu/libQt5Gui.so /usr/lib/aarch64-linux-gnu/libQt5Core.so /usr/lib/aarch64-linux-gnu/libGL.so -lpthread
|
|
AR = ar cqs
|
|
RANLIB =
|
|
SED = sed
|
|
--
|
|
2.36.1
|
|
|