revert to classic call to cmake

(cherry picked from commit 1435998) (cherry picked from commit 725aa83)
qgis · Feb 27, 2021 · c9d5a11 · c9d5a11
1 parent 8c0feff
commit c9d5a11
Showing 1 changed file with 32 additions and 33 deletions.
diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -33,47 +33,46 @@ echo "::group::cmake"
 export CC=/usr/lib/ccache/clang
 export CXX=/usr/lib/ccache/clang++
 
-CMAKE_ARGS=(
- "-GNinja"
- "-DUSE_CCACHE=OFF"
- "-DWITH_QUICK=OFF"
- "-DWITH_3D=ON"
- "-DWITH_STAGED_PLUGINS=ON"
- "-DWITH_GRASS=OFF"
- "-DSUPPRESS_QT_WARNINGS=ON"
- "-DENABLE_TESTS=ON"
- "-DENABLE_MODELTEST=ON"
- "-DENABLE_PGTEST=ON"
- "-DENABLE_SAGA_TESTS=ON"
- "-DENABLE_MSSQLTEST=ON"
- "-DPUSH_TO_CDASH=${PUSH_TO_CDASH}"
- "-DWITH_QSPATIALITE=ON"
- "-DWITH_QWTPOLAR=OFF"
- "-DWITH_APIDOC=OFF"
- "-DWITH_ASTYLE=OFF"
- "-DWITH_DESKTOP=ON"
- "-DWITH_BINDINGS=ON"
- "-DWITH_SERVER=ON"
- "-DWITH_ORACLE=ON"
- "-DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/"
- "-DORACLE_LIBDIR=/instantclient_19_9/"
- "-DDISABLE_DEPRECATED=ON"
- "-DPYTHON_TEST_WRAPPER=\"timeout -sSIGSEGV 55s\""
- "-DCXX_EXTRA_FLAGS=\"${CLANG_WARNINGS}\""
- "-DWERROR=TRUE"
- "-DADD_CLAZY_CHECKS=ON"
-)
+CMAKE_EXTRA_ARGS=()
 if [[ ${PATCH_QT_3D} == "true" ]]; then
-  CMAKE_ARGS+=(
+  CMAKE_EXTRA_ARGS+=(
     "-DQT5_3DEXTRA_LIBRARY=/usr/lib/x86_64-linux-gnu/libQt53DExtras.so"
     "-DQT5_3DEXTRA_INCLUDE_DIR=/root/QGIS/external/qt3dextra-headers"
     "-DCMAKE_PREFIX_PATH=/root/QGIS/external/qt3dextra-headers/cmake"
     "-DQt53DExtras_DIR=/root/QGIS/external/qt3dextra-headers/cmake/Qt53DExtras"
   )
 fi
 
-echo "Running cmake ${CMAKE_ARGS[*]} .."
-cmake ${CMAKE_ARGS[*]} ..
+cmake \
+ GNinja \
+ DUSE_CCACHE=OFF \
+ DWITH_QUICK=OFF \
+ DWITH_3D=ON \
+ DWITH_STAGED_PLUGINS=ON \
+ DWITH_GRASS=OFF \
+ DSUPPRESS_QT_WARNINGS=ON \
+ DENABLE_TESTS=ON \
+ DENABLE_MODELTEST=ON \
+ DENABLE_PGTEST=ON \
+ DENABLE_SAGA_TESTS=ON \
+ DENABLE_MSSQLTEST=ON \
+ DPUSH_TO_CDASH=${PUSH_TO_CDASH} \
+ DWITH_QSPATIALITE=ON \
+ DWITH_QWTPOLAR=OFF \
+ DWITH_APIDOC=OFF \
+ DWITH_ASTYLE=OFF \
+ DWITH_DESKTOP=ON \
+ DWITH_BINDINGS=ON \
+ DWITH_SERVER=ON \
+ DWITH_ORACLE=ON \
+ DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/ \
+ DORACLE_LIBDIR=/instantclient_19_9/ \
+ DDISABLE_DEPRECATED=ON \
+ DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s" \
+ DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
+ DWERROR=TRUE \
+ DADD_CLAZY_CHECKS=ON \
+ ${CMAKE_EXTRA_ARGS[*]} ..
 echo "::endgroup::"
 
 #######