disable draco in nightly

qgis · Aug 9, 2023 · b3558ab · b3558ab
1 parent db01456
commit b3558ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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