Johannes Kreutz 3 年之前
父节点
当前提交
0d2c8a4f8d
共有 2 个文件被更改,包括 27 次插入11 次删除
  1. 10 0
      trackpoint-app/build-dependencies-first.sh
  2. 17 11
      trackpoint-app/thirdparty/qt.sh

+ 10 - 0
trackpoint-app/build-dependencies-first.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# Builds all dependencies which are no clean CMake projects, so using FetchContent is not possible.
+
+if [ $1 == "release" ]; then
+  OPTIONS="release"
+else
+  OPTIONS=""
+fi
+
+thirdparty/qt.sh $OPTIONS

+ 17 - 11
trackpoint-app/thirdparty/qt.sh

@@ -3,7 +3,14 @@
 
 set -e
 
-BASEDIR=$PWD/thirdparty/qt
+if [ $1 == "release" ]; then
+  BASEDIR=$PWD/thirdparty/qt-static
+  OPTIONS="-static"
+else
+  BASEDIR=$PWD/thirdparty/qt
+  OPTIONS=""
+fi
+
 DEPLOYDIR=$BASEDIR/install
 
 QT_MAJOR=6
@@ -32,16 +39,15 @@ fi
 tar -xf "qt-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_BUGFIX.tar.xz"
 pushd "qt-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_BUGFIX"
 
-./configure -static -ltcg -optimize-size -no-pch -prefix $DEPLOYDIR -release -opensource -confirm-license \
-		-nomake examples -nomake tests -nomake tools \
-		-no-xcb -no-glib -no-harfbuzz -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc \
-		-no-sql-psql -no-sql-sqlite -no-cups -no-qml-debug \
-                -skip qtscxml -skip qtwayland -skip qtdatavis3d -skip qtcharts \
-                -skip qtquickcontrols2 -skip qtvirtualkeyboard -skip qtshadertools \
-                -skip qttranslations -skip qtdoc -skip qt3d -skip qtnetworkauth \
-                -skip qt5compat -skip qtcoap -skip qtlottie -skip qtmqtt \
-                -skip qtopcua -skip qtquick3d -skip qtquicktimeline -skip qttools \
-                -skip qtdeclarative -skip qtactiveqt
+./configure $OPTIONS -ltcg -optimize-size -no-pch -prefix $DEPLOYDIR -release -opensource -confirm-license \
+    -nomake examples -nomake tests -nomake tools \
+    -journald \
+    -skip qtscxml -skip qtwayland -skip qtdatavis3d -skip qtcharts \
+    -skip qtquickcontrols2 -skip qtvirtualkeyboard -skip qtshadertools \
+    -skip qttranslations -skip qtdoc -skip qt3d -skip qtnetworkauth \
+    -skip qt5compat -skip qtcoap -skip qtlottie -skip qtmqtt \
+    -skip qtopcua -skip qtquick3d -skip qtquicktimeline -skip qttools \
+    -skip qtdeclarative -skip qtactiveqt
 
 cmake --build . --parallel
 cmake --install .