From 6d0226bdf0fbf63c80879aa2884fe6f22df7a745 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Wed, 30 Nov 2022 13:43:19 +0800 Subject: [PATCH] fix compile error of libkysdk-applications --- kysdk-alm/kysdk-alm.pro | 12 ++++++++++- kysdk-application.pro | 6 ++++++ kysdk-kabase/kabase/image/utils.cpp | 8 ++++---- kysdk-kabase/kabase/kabase.pro | 20 +++++++++++++++++-- .../kylin_image_codec/kylinimagecodec.cpp | 4 ++-- kysdk-ukenv/kysdk-ukenv.pro | 12 ++++++++++- kysdk-waylandhelper/kysdk-waylandhelper.pro | 8 ++++++-- kysdk-widgetutils/kysdk-widgetutils.pro | 5 ++++- 8 files changed, 62 insertions(+), 13 deletions(-) diff --git a/kysdk-alm/kysdk-alm.pro b/kysdk-alm/kysdk-alm.pro index d45dc56..63ed0ec 100644 --- a/kysdk-alm/kysdk-alm.pro +++ b/kysdk-alm/kysdk-alm.pro @@ -8,4 +8,14 @@ HEADERS += src/singleapplication/singleapplication.h \ src/singleapplication/localpeer.h \ SOURCES += src/singleapplication/singleapplication.cpp \ - src/singleapplication/localpeer.cpp \ \ No newline at end of file + src/singleapplication/localpeer.cpp \ + +# Default rules for deployment. +unix { + target.path = /usr/lib/kysdk/applications/ +} +!isEmpty(target.path): INSTALLS += target + +headers.files = $${HEADERS} +headers.path = /usr/include/kysdk/applications/ +INSTALLS += headers diff --git a/kysdk-application.pro b/kysdk-application.pro index 90eb59d..eaf57fe 100644 --- a/kysdk-application.pro +++ b/kysdk-application.pro @@ -10,6 +10,12 @@ SUBDIRS = \ kysdk-alm \ kysdk-ukenv +pc.files = development-files/*.pc +pc.path = /usr/share/pkgconfig +conf.files = config/kysdk-applications.conf +conf.path = /etc/ld.so.conf.d/ +# Default rules for deployment. +INSTALLS += pc conf diff --git a/kysdk-kabase/kabase/image/utils.cpp b/kysdk-kabase/kabase/image/utils.cpp index 2f1d979..96d0bc7 100644 --- a/kysdk-kabase/kabase/image/utils.cpp +++ b/kysdk-kabase/kabase/image/utils.cpp @@ -144,9 +144,9 @@ FREE_IMAGE_FORMAT Utils::getImageFiFormat(QString path) return FIF_GIF; case image::ImageFormat::HDR: return FIF_HDR; - case image::ImageFormat::FAX: - case image::ImageFormat::G3: - return FIF_FAXG3; +// case image::ImageFormat::FAX: +// case image::ImageFormat::G3: +// return FIF_FAXG3; case image::ImageFormat::SGI: return FIF_SGI; case image::ImageFormat::CUT: @@ -286,4 +286,4 @@ bool Utils::deleteDir(QString path) } } /* namespace kabase */ -} /* namespace kdk */ \ No newline at end of file +} /* namespace kdk */ diff --git a/kysdk-kabase/kabase/kabase.pro b/kysdk-kabase/kabase/kabase.pro index 38dc8b7..07df867 100644 --- a/kysdk-kabase/kabase/kabase.pro +++ b/kysdk-kabase/kabase/kabase.pro @@ -14,7 +14,7 @@ CONFIG += c++11 console link_pkgconfig no_keywords LIBS += -ldl -lpthread -lsystemd -lkylog -lkyconf -L/usr/lib/kysdk/kysdk-base greaterThan(QT_VER_MAJ , 4) { - LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lstb -lfreeimage -lfreeimageplus + LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lfreeimage -lfreeimageplus } else { message("--- v10 project ---") } @@ -79,4 +79,20 @@ greaterThan(QT_VER_MAJ , 4) { } # 窗管模块 -QT += x11extras KWindowSystem \ No newline at end of file +QT += x11extras KWindowSystem + +# Default rules for deployment. +unix { + target.path = /usr/lib/kysdk/applications/ + include.files += *.hpp kylin_system + include.path = /usr/include/kysdk/applications/kabase + kylin_system.files += kylin_image_codec/*.hpp + kylin_image_codec.files += kylin_image_codec/*.hpp + single_application.files += single_application/*.hpp + kylin_system.path = /usr/include/kysdk/applications/kabase/kylin_system + kylin_image_codec.path = /usr/include/kysdk/applications/kabase/kylin_image_codec + single_application.path = /usr/include/kysdk/applications/kabase/single_application +} +!isEmpty(target.path): INSTALLS += target include kylin_system kylin_image_codec single_application + + diff --git a/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp b/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp index 760e5e3..86d4966 100644 --- a/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp +++ b/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp @@ -75,8 +75,8 @@ QHash KylinImageCodec::creatFormats() tmpFormats.insert("DDS", FIF_DDS); tmpFormats.insert("GIF", FIF_GIF); tmpFormats.insert("HDR", FIF_HDR); - tmpFormats.insert("FAX", FIF_FAXG3); - tmpFormats.insert("G3", FIF_FAXG3); +// tmpFormats.insert("FAX", FIF_FAXG3); +// tmpFormats.insert("G3", FIF_FAXG3); tmpFormats.insert("SGI", FIF_SGI); tmpFormats.insert("CUT", FIF_CUT); tmpFormats.insert("JNG", FIF_JNG); diff --git a/kysdk-ukenv/kysdk-ukenv.pro b/kysdk-ukenv/kysdk-ukenv.pro index 3d7b4ed..177b153 100644 --- a/kysdk-ukenv/kysdk-ukenv.pro +++ b/kysdk-ukenv/kysdk-ukenv.pro @@ -12,4 +12,14 @@ HEADERS += src/usermanual.h \ SOURCES += src/usermanual.cpp \ src/currency.cpp \ - src/gsettingmonitor.cpp \ No newline at end of file + src/gsettingmonitor.cpp + +# Default rules for deployment. +unix { + target.path = /usr/lib/kysdk/applications/ +} +!isEmpty(target.path): INSTALLS += target + +headers.files = $${HEADERS} +headers.path = /usr/include/kysdk/applications/ +INSTALLS += headers diff --git a/kysdk-waylandhelper/kysdk-waylandhelper.pro b/kysdk-waylandhelper/kysdk-waylandhelper.pro index 790d0d5..bd51d35 100644 --- a/kysdk-waylandhelper/kysdk-waylandhelper.pro +++ b/kysdk-waylandhelper/kysdk-waylandhelper.pro @@ -42,8 +42,12 @@ HEADERS += \ src/windowmanager/windowmanager.h \ src/kysdk-waylandhelper_global.h \ -headers.files = $${HEADERS} +headers.files = src/*.h src/windowmanager src/ukuistylehelper +windowmanager.files = src/windowmanager/*.h +ukuistylehelper.files = src/ukuistylehelper/*.h headers.path = /usr/include/kysdk/applications/ +windowmanager.path = /usr/include/kysdk/applications/windowmanager +ukuistylehelper.path = /usr/include/kysdk/applications/ukuistylehelper target.path = /usr/lib/kysdk/applications/ # Default rules for deployment. -INSTALLS += target headers +INSTALLS += target headers windowmanager ukuistylehelper diff --git a/kysdk-widgetutils/kysdk-widgetutils.pro b/kysdk-widgetutils/kysdk-widgetutils.pro index 7aaad6c..4249aca 100644 --- a/kysdk-widgetutils/kysdk-widgetutils.pro +++ b/kysdk-widgetutils/kysdk-widgetutils.pro @@ -25,6 +25,9 @@ HEADERS += \ # Default rules for deployment. unix { - target.path = /usr/lib + target.path = /usr/lib/kysdk/applications/ } !isEmpty(target.path): INSTALLS += target +headers.files = $${HEADERS} +headers.path = /usr/include/kysdk/applications/ +INSTALLS += headers -- 2.36.1