Commit 7a394aa0 authored by Linus Jahn's avatar Linus Jahn Committed by Mauricio Torres Mejía

utils: build-ios: Move library installation folders out of /tmp

parent 1b74860d
Pipeline #10925 passed with stages
in 20 minutes and 29 seconds
......@@ -12,9 +12,10 @@ BUILD_TYPE="${BUILD_TYPE:-Debug}"
PLATFORM="${PLATFORM:-OS64}"
KAIDAN_SOURCES=$(dirname "$(greadlink -f "${0}")")/..
KIRIGAMI_BUILD=/tmp/kirigami-ios-build-$PLATFORM
QXMPP_BUILD=/tmp/qxmpp-ios-build-$PLATFORM
ZXING_BUILD=/tmp/zxing-ios-build-$PLATFORM
BUILD_FOLDER=$KAIDAN_SOURCES/build-$PLATFORM
KIRIGAMI_BUILD=$KAIDAN_SOURCES/build-deps/kirigami-ios-$PLATFORM
QXMPP_BUILD=$KAIDAN_SOURCES/build-deps/qxmpp-ios-$PLATFORM
ZXING_BUILD=$KAIDAN_SOURCES/build-deps/zxing-ios-$PLATFORM
echo "-- Starting $BUILD_TYPE build of Kaidan --"
......@@ -45,7 +46,7 @@ cdnew() {
export QT_SELECT=qt5
export DEPLOYMENT_VERSION="10.0"
if [ ! -f "$QXMPP_BUILD/lib/pkgconfig/qxmpp.pc" ]; then
if [ ! -f "$QXMPP_BUILD/lib/cmake/qxmpp/QXmpp.cmake" ]; then
echo "*****************************************"
echo "Building QXmpp"
echo "*****************************************"
......@@ -55,7 +56,8 @@ echo "*****************************************"
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_PREFIX_PATH=$QT_IOS \
-DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED=OFF \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$QXMPP_BUILD \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_INSTALL_PREFIX=$QXMPP_BUILD \
-DCMAKE_TOOLCHAIN_FILE=../../ios-cmake/ios.toolchain.cmake \
-DPLATFORM=$PLATFORM \
-DPKG_CONFIG_EXECUTABLE=/usr/local/bin/pkg-config
......@@ -150,14 +152,16 @@ echo "*****************************************"
echo "Building Kaidan"
echo "*****************************************"
{
cdnew $KAIDAN_SOURCES/build-$PLATFORM
cdnew $KAIDAN_SOURCES/build-$PLATFORM
cmake .. \
-GXcode \
-DPERL_EXECUTABLE=/usr/bin/perl \
-DSTATIC_BUILD=ON \
-DECM_DIR=/usr/local/share/ECM/cmake \
-DCMAKE_PREFIX_PATH=$QT_IOS\;$KIRIGAMI_BUILD\;$QXMPP_BUILD \
-DKF5Kirigami2_DIR=$KIRIGAMI_BUILD/lib/cmake/KF5Kirigami2 -DI18N=1 \
-DKF5Kirigami2_DIR=$KIRIGAMI_BUILD/lib/cmake/KF5Kirigami2 \
-DAPPLE_SUPPRESS_X11_WARNING=ON \
-DI18N=1 \
-DZXing_DIR=$ZXING_BUILD/lib/cmake/ZXing \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_TOOLCHAIN_FILE=../3rdparty/ios-cmake/ios.toolchain.cmake \
......
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