Simplify cmake configuration in mingw build script

qgis · Sep 30, 2021 · 711ed22 · 711ed22
1 parent 721c10a
commit 711ed22
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/ms-windows/mingw/build.sh b/ms-windows/mingw/build.sh
@@ -76,17 +76,11 @@ mkdir -p "$BUILDDIR"
 (
   CRSSYNC_BIN=$(readlink -f "$SRCDIR")/build/output/bin/crssync
   cd "$BUILDDIR"
-  QSCI_VER=$(grep -Eo '\s*([0-9]+\.[0-9]+\.[0-9]+)' "$MINGWROOT/include/qt5/Qsci/qsciglobal.h")
   mingw$bits-cmake \
     -DCMAKE_CROSS_COMPILING=1 \
     -DUSE_CCACHE=ON \
     -DCMAKE_BUILD_TYPE=$buildtype \
     -DNATIVE_CRSSYNC_BIN="$CRSSYNC_BIN" \
-    -DQSCINTILLA_VERSION_STR="$QSCI_VER" \
-    -DQSCINTILLA_LIBRARY="$MINGWROOT/lib/libqscintilla2_qt5.dll.a" \
-    -DQSCI_MOD_VERSION_STR="$QSCI_VER" \
-    -DQWT_INCLUDE_DIR="$MINGWROOT/include/qt5/qwt" \
-    -DQSCI_SIP_DIR="$MINGWROOT/share/sip/PyQt5/Qsci/" \
     -DBUILD_TESTING=OFF \
     -DENABLE_TESTS=OFF \
     -DQGIS_BIN_SUBDIR=bin \
@@ -101,8 +95,6 @@ mkdir -p "$BUILDDIR"
     -DBINDINGS_GLOBAL_INSTALL=ON \
     -DSIP_GLOBAL_INSTALL=ON \
     -DWITH_SERVER=ON \
-    -DZSTD_INCLUDE_DIR="$MINGWROOT/include/zstd" \
-    -DZSTD_LIBRARY="$MINGWROOT/lib/libzstd.dll.a" \
     -DTXT2TAGS_EXECUTABLE= \
     ..
 )