Commit 35823097 authored by Jonah Brüchert's avatar Jonah Brüchert 🌳 Committed by LNJ

ubuntu-touch: Port qxmpp build to clickable build-libs

parent 9f197a14
......@@ -6,5 +6,20 @@
"dependencies_build": [
"ninja-build",
"extra-cmake-modules"
]
],
"libraries": {
"qxmpp": {
"template": "cmake",
"src_dir": "3rdparty/qxmpp",
"make_jobs": 2,
"build_args": [
"-DCMAKE_BUILD_TYPE=Release",
"-DBUILD_TESTS=OFF",
"-DBUILD_EXAMPLES=OFF",
"-DCMAKE_PREFIX_PATH=../../../bin/ubuntu-touch/tmp",
"-DCMAKE_INSTALL_PREFIX=../../../bin/ubuntu-touch/tmp"
],
"postbuild": "make install"
}
}
}
......@@ -8,23 +8,7 @@ mkdir -p $CLICK_TARGET_DIR
DATE=$(date +%Y%m%d.%H%M)
ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
BUILD_DIR="build-${ARCH}"
build_qxmpp() {
mkdir -p $KAIDAN_SOURCES/3rdparty/qxmpp/$BUILD_DIR
cd $KAIDAN_SOURCES/3rdparty/qxmpp/$BUILD_DIR
cmake -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTS=0 \
-DBUILD_EXAMPLES=0 \
-DCMAKE_MAKE_PROGRAM=/usr/bin/ninja \
-DCMAKE_PREFIX_PATH="${CLICK_TARGET_DIR}" \
-DCMAKE_INSTALL_PREFIX="${CLICK_TARGET_DIR}" \
$KAIDAN_SOURCES/3rdparty/qxmpp
ninja install
}
BUILD_DIR="build/${DEB_ARCH_MULTIARCH}"
build_kaidan() {
mkdir -p $KAIDAN_SOURCES/$BUILD_DIR
......@@ -61,7 +45,6 @@ echo "*****************************************"
echo "Building Kaidan"
echo "*****************************************"
build_qxmpp
build_kaidan
cleanup_click_dir
......
......@@ -14,7 +14,7 @@ cd ${BUILD_DIR}/build
if [[ ${PLATFORM} == "ubuntu-touch" ]]; then
cd ..
git submodule update --init --remote --checkout
clickable clean build click-build review
clickable clean build-libs build click-build review
if [ ! -z $OPENSTORE_API_KEY ] && [ ! -z $CI_COMMIT_TAG ]; then
clickable publish
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment