From b3558ab765f0d776541ed8dea1df177f715f4f6a Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Wed, 9 Aug 2023 19:07:35 +0200 Subject: [PATCH] disable draco in nightly --- config/nightly.conf | 1 + qgis_build/qgis_build.bash | 1 + scripts/run_pkg.bash | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/nightly.conf b/config/nightly.conf index 9a59b61f..548f276d 100755 --- a/config/nightly.conf +++ b/config/nightly.conf @@ -12,6 +12,7 @@ export WITH_ECW="true" export WITH_MRSID="true" export WITH_ORACLE="true" export WITH_PDAL="true" +export QGIS_CMAKE="-DWITH_DRACO=NO" export USE_SEM="false" diff --git a/qgis_build/qgis_build.bash b/qgis_build/qgis_build.bash index 46908f4c..3b12a00d 100755 --- a/qgis_build/qgis_build.bash +++ b/qgis_build/qgis_build.bash @@ -72,6 +72,7 @@ echo "Using $CXX compiler" PATH=$ROOT_OUT_PATH/stage/bin:$PATH \ cmake -DCMAKE_BUILD_TYPE=Release \ -DWITH_HANA=TRUE \ + $QGIS_CMAKE \ $ORACLE_CMAKE \ -DQGIS_MAC_DEPS_DIR=$ROOT_OUT_PATH/stage \ -DODBC_CONFIG=$ROOT_OUT_PATH/stage/unixodbc/bin/odbc_config \ diff --git a/scripts/run_pkg.bash b/scripts/run_pkg.bash index 79294356..1f8fe57d 100755 --- a/scripts/run_pkg.bash +++ b/scripts/run_pkg.bash @@ -69,10 +69,10 @@ if [ $PKG = "nightly" ]; then # Get the qt+pylupdate5 from the QGIS-Deps CONFIG_FILE=$DIR/../config/$PKG.conf - if [ ! -f "$CONFIG_FILE" ]; then - echo "invalid config file (1st argument) $CONFIG_FILE" - fi - source $CONFIG_FILE + if [ ! -f "$CONFIG_FILE" ]; then + echo "invalid config file (1st argument) $CONFIG_FILE" + fi + source $CONFIG_FILE if ! PATH=$QT_BASE/clang_64/bin:$DEPS_BIN_DIR:$PATH scripts/pull_ts.sh; then echo "Pulling translations failed [$?]" rm -rvf i18n doc/TRANSLATORS