Verified Commit 431ccf09 authored by Ilya Bizyaev's avatar Ilya Bizyaev 📱 Committed by Linus Jahn

Fix static build with Qt 5.12 and QXmpp 1.0

parent abfcc2ee
Pipeline #3279 failed with stages
in 2 minutes and 5 seconds
...@@ -158,7 +158,7 @@ if(ANDROID) ...@@ -158,7 +158,7 @@ if(ANDROID)
endif() endif()
if(STATIC_BUILD) if(STATIC_BUILD)
add_definitions(-DQXMPP_STATIC) add_definitions(-DQXMPP_BUILD)
find_package(Perl REQUIRED) find_package(Perl REQUIRED)
...@@ -218,6 +218,7 @@ if(STATIC_BUILD) ...@@ -218,6 +218,7 @@ if(STATIC_BUILD)
find_library(QLAYOUTS_PLUGIN qquicklayoutsplugin PATHS ${QT_QML_PATH}/qml/QtQuick/Layouts) find_library(QLAYOUTS_PLUGIN qquicklayoutsplugin PATHS ${QT_QML_PATH}/qml/QtQuick/Layouts)
find_library(QWINDOW_PLUGIN windowplugin PATHS ${QT_QML_PATH}/qml/QtQuick/Window.2) find_library(QWINDOW_PLUGIN windowplugin PATHS ${QT_QML_PATH}/qml/QtQuick/Window.2)
find_library(QSHAPES_PLUGIN qmlshapesplugin PATHS ${QT_QML_PATH}/qml/QtQuick/Shapes) find_library(QSHAPES_PLUGIN qmlshapesplugin PATHS ${QT_QML_PATH}/qml/QtQuick/Shapes)
find_library(QUICKSHAPES Qt5QuickShapes PATHS ${QT_LIBDIR})
find_library(QTEMPLATES_PLUGIN qtquicktemplates2plugin PATHS ${QT_QML_PATH}/qml/QtQuick/Templates.2) find_library(QTEMPLATES_PLUGIN qtquicktemplates2plugin PATHS ${QT_QML_PATH}/qml/QtQuick/Templates.2)
find_library(QMODELS_PLUGIN modelsplugin PATHS ${QT_QML_PATH}/qml/QtQml/Models.2) find_library(QMODELS_PLUGIN modelsplugin PATHS ${QT_QML_PATH}/qml/QtQml/Models.2)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
...@@ -242,6 +243,7 @@ if(STATIC_BUILD) ...@@ -242,6 +243,7 @@ if(STATIC_BUILD)
${QLAYOUTS_PLUGIN} ${QLAYOUTS_PLUGIN}
${QWINDOW_PLUGIN} ${QWINDOW_PLUGIN}
${QSHAPES_PLUGIN} ${QSHAPES_PLUGIN}
${QUICKSHAPES}
${QTEMPLATES_PLUGIN} ${QTEMPLATES_PLUGIN}
${QMODELS_PLUGIN} ${QMODELS_PLUGIN}
${__Qt5Widgets_LIBRARIES} ${__Qt5Widgets_LIBRARIES}
......
...@@ -57,7 +57,7 @@ echo "*****************************************" ...@@ -57,7 +57,7 @@ echo "*****************************************"
cmake .. \ cmake .. \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_PREFIX_PATH=$QT_IOS \ -DCMAKE_PREFIX_PATH=$QT_IOS \
-DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF \ -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 \ -DCMAKE_TOOLCHAIN_FILE=../../ios-cmake/ios.toolchain.cmake \
-DIOS_PLATFORM=$IOS_PLATFORM \ -DIOS_PLATFORM=$IOS_PLATFORM \
...@@ -144,6 +144,6 @@ cdnew $KAIDAN_SOURCES/build ...@@ -144,6 +144,6 @@ cdnew $KAIDAN_SOURCES/build
-DIOS_PLATFORM=$IOS_PLATFORM \ -DIOS_PLATFORM=$IOS_PLATFORM \
-DIOS_DEPLOYMENT_TARGET="10.0" \ -DIOS_DEPLOYMENT_TARGET="10.0" \
-DIOS_ARCH="arm64" -DIOS_ARCH="arm64"
} }
fi fi
...@@ -7,7 +7,7 @@ if [ -z "$MXE_ROOT" ]; then ...@@ -7,7 +7,7 @@ if [ -z "$MXE_ROOT" ]; then
exit 1 exit 1
fi fi
# Build type is one of: # Build type is one of:
# Debug, Release, RelWithDebInfo and MinSizeRel # Debug, Release, RelWithDebInfo and MinSizeRel
BUILD_TYPE="${BUILD_TYPE:-Debug}" BUILD_TYPE="${BUILD_TYPE:-Debug}"
# MXE target is one of: # MXE target is one of:
...@@ -78,7 +78,7 @@ echo "*****************************************" ...@@ -78,7 +78,7 @@ echo "*****************************************"
-DECM_DIR=/usr/share/ECM/cmake \ -DECM_DIR=/usr/share/ECM/cmake \
-DSTATIC_LIBRARY=1 \ -DSTATIC_LIBRARY=1 \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
make -j$(nproc) make -j$(nproc)
make install make install
rm -rf $KAIDAN_SOURCES/3rdparty/kirigami/build rm -rf $KAIDAN_SOURCES/3rdparty/kirigami/build
...@@ -94,6 +94,7 @@ echo "*****************************************" ...@@ -94,6 +94,7 @@ echo "*****************************************"
$MXE_TARGET-cmake .. \ $MXE_TARGET-cmake .. \
-DBUILD_TESTS=OFF \ -DBUILD_TESTS=OFF \
-DBUILD_EXAMPLES=OFF \ -DBUILD_EXAMPLES=OFF \
-DBUILD_SHARED=OFF \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
make -j$(nproc) make -j$(nproc)
...@@ -110,14 +111,14 @@ if [ ! -d "$KAIDAN_SOURCES/misc/windows" ]; then ...@@ -110,14 +111,14 @@ if [ ! -d "$KAIDAN_SOURCES/misc/windows" ]; then
inkscape -z -e $2 -w $3 -h $3 $1 inkscape -z -e $2 -w $3 -h $3 $1
optipng -quiet $2 optipng -quiet $2
} }
winlogo() { winlogo() {
rendersvg $KAIDAN_SOURCES/misc/kaidan-small-margin.svg "$KAIDAN_SOURCES/misc/windows/$1-kaidan.png" $1 rendersvg $KAIDAN_SOURCES/misc/kaidan-small-margin.svg "$KAIDAN_SOURCES/misc/windows/$1-kaidan.png" $1
optipng -o9 "$KAIDAN_SOURCES/misc/windows/$1-kaidan.png" optipng -o9 "$KAIDAN_SOURCES/misc/windows/$1-kaidan.png"
} }
mkdir -p $KAIDAN_SOURCES/misc/windows mkdir -p $KAIDAN_SOURCES/misc/windows
winlogo 16 winlogo 16
winlogo 32 winlogo 32
winlogo 48 winlogo 48
...@@ -130,12 +131,12 @@ echo "Building Kaidan" ...@@ -130,12 +131,12 @@ echo "Building Kaidan"
echo "*****************************************" echo "*****************************************"
{ {
cdnew $KAIDAN_SOURCES/build cdnew $KAIDAN_SOURCES/build
$MXE_TARGET-cmake .. \ $MXE_TARGET-cmake .. \
-DECM_DIR=/usr/share/ECM/cmake -DI18N=1 \ -DECM_DIR=/usr/share/ECM/cmake -DI18N=1 \
-DSTATIC_BUILD=1 \ -DSTATIC_BUILD=1 \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
make -j$(nproc) make -j$(nproc)
} }
fi 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