fix: build w/o 3D for Qt 5.15 (many deprecation warnings)

Signed-off-by: t0b3 <thomas.bettler@gmail.com>
qgis · Mar 21, 2021 · f3a81eb · f3a81eb
1 parent eaa2d74
commit f3a81eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -47,7 +47,7 @@ cmake \
  -GNinja \
  -DUSE_CCACHE=OFF \
  -DWITH_QUICK=OFF \
- -DWITH_3D=ON \
+ -DWITH_3D=${WITH_3D} \
  -DWITH_STAGED_PLUGINS=ON \
  -DWITH_GRASS=OFF \
  -DSUPPRESS_QT_WARNINGS=ON \

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -58,15 +58,19 @@ jobs:
           DOCKER_TAG=$(echo $( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo ${GITHUB_BASE_REF} || echo ${GITHUB_REF##*/} ) | sed 's/^master$/latest/')$( [[ ${UBUNTU_BASE} != ${DEFAULT_UBUNTU_BASE} ]] && echo "_${UBUNTU_BASE}" || echo "" )
           CTEST_BUILD_NAME=$( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo "PR${GITHUB_PR_NUMBER}" || echo ${GITHUB_REF##*/} )"_${GITHUB_SHA}"
           [[ ${UBUNTU_BASE} == "20.04" ]] && PATCH_QT_3D=true || PATCH_QT_3D=false
+          # build w/o 3D for Qt 5.15 (many deprecation warnings)
+          [[ ${UBUNTU_BASE} == "21.04" ]] && WITH_3D=FALSE || WITH_3D=TRUE
           echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV
           echo "CTEST_BUILD_NAME=${CTEST_BUILD_NAME}" >> $GITHUB_ENV
           echo "PATCH_QT_3D=${PATCH_QT_3D}" >> $GITHUB_ENV
+          echo "WITH_3D=${WITH_3D}" >> $GITHUB_ENV
 
       - name: Print vars
         run: |
           echo DOCKER_TAG: ${DOCKER_TAG}
           echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
           echo PATCH_QT_3D: ${PATCH_QT_3D}
+          echo WITH_3D: ${WITH_3D}
 
       - name: Build deps
         env:
@@ -116,6 +120,7 @@ jobs:
                      -v /home/runner/QGIS/.ccache:/root/.ccache \
                      --env-file .docker/docker-variables.env \
                      --env PUSH_TO_CDASH=true \
+                     --env WITH_3D=${WITH_3D} \
                      qgis/qgis3-build-deps:${DOCKER_TAG} \
                      /root/QGIS/.docker/docker-qgis-build.sh
           docker commit qgis_container qgis_image