libfcitx-qt5: generate correct config for cross-compile

See: https://github.com/fcitx/fcitx-qt5/pull/39
Also ships the BSD license file.
This commit is contained in:
Đoàn Trần Công Danh 2020-05-16 09:48:09 +07:00
parent 21e07685fd
commit e81186079e
2 changed files with 36 additions and 6 deletions

View file

@ -0,0 +1,28 @@
diff --git a/dbusaddons/CMakeLists.txt b/dbusaddons/CMakeLists.txt
index 75f4ab8..2299330 100644
--- a/dbusaddons/CMakeLists.txt
+++ b/dbusaddons/CMakeLists.txt
@@ -51,7 +51,8 @@ generate_export_header(FcitxQt5DBusAddons BASE_NAME FcitxQtDBusAddons)
add_library(FcitxQt5::DBusAddons ALIAS FcitxQt5DBusAddons)
target_include_directories(FcitxQt5DBusAddons PUBLIC "$<BUILD_INTERFACE:${fcitxqtdbusaddons_INCLUDE_DIRS}>")
-target_include_directories(FcitxQt5DBusAddons INTERFACE "$<INSTALL_INTERFACE:${FcitxQt5_INCLUDE_INSTALL_DIR}/FcitxQtDBusAddons>")
+target_include_directories(FcitxQt5DBusAddons
+ INTERFACE $<INSTALL_INTERFACE:include/FcitxQt5/FcitxQtDBusAddons>)
set_target_properties(FcitxQt5DBusAddons
PROPERTIES VERSION 1.0
diff --git a/widgetsaddons/CMakeLists.txt b/widgetsaddons/CMakeLists.txt
index 4d2b29e..bad852e 100644
--- a/widgetsaddons/CMakeLists.txt
+++ b/widgetsaddons/CMakeLists.txt
@@ -52,7 +52,8 @@ generate_export_header(FcitxQt5WidgetsAddons BASE_NAME FcitxQtWidgetsAddons)
add_library(FcitxQt5::WidgetsAddons ALIAS FcitxQt5WidgetsAddons)
target_include_directories(FcitxQt5WidgetsAddons PUBLIC "$<BUILD_INTERFACE:${fcitxqtwidgetsaddons_INCLUDE_DIRS}>")
-target_include_directories(FcitxQt5WidgetsAddons INTERFACE "$<INSTALL_INTERFACE:${FcitxQt5_INCLUDE_INSTALL_DIR}/FcitxQtWidgetsAddons>")
+target_include_directories(FcitxQt5WidgetsAddons
+ INTERFACE $<INSTALL_INTERFACE:include/FcitxQt5/FcitxQtWidgetsAddons>)
set_target_properties(FcitxQt5WidgetsAddons
PROPERTIES VERSION 1.0

View file

@ -1,21 +1,23 @@
# Template file for 'libfcitx-qt5'
pkgname=libfcitx-qt5
version=1.2.3
revision=1
revision=2
wrksrc="fcitx-qt5-${version}"
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config"
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake
qt5-host-tools libfcitx"
makedepends="fcitx-devel libxkbcommon-devel qt5-devel"
short_desc="Flexible Context-aware Input Tool with eXtension - Qt5 IM module"
maintainer="Robert La Spina <rkidlaspina@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://fcitx-im.org/"
distfiles="http://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-${version}.tar.xz"
checksum=fef09d3f5a7e6b4860169290c0cfe731a9039793ebbf43f6d823fcb920c3dfa5
patch_args=-Np1
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools libfcitx"
fi
post_install() {
vlicense COPYING.BSD
}
libfcitx-qt5-devel_package() {
short_desc+=" - development files"