sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-16 00:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on qt version switch for extra compilation options

Browse Source
This commit is contained in:
Nyall Dawson 2025-08-19 09:09:08 +10:00
parent 6f05b701dd
commit d940815831
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.docker/docker-qgis-build.sh
View File

@ -93,22 +93,22 @@ cmake \
-DWITH_GRASS8=${WITH_GRASS8} \ -DWITH_GRASS8=${WITH_GRASS8} \
-DWITH_GRASS_PLUGIN=${WITH_GRASS8} \ -DWITH_GRASS_PLUGIN=${WITH_GRASS8} \
-DENABLE_TESTS=ON \ -DENABLE_TESTS=ON \
-DENABLE_MODELTEST=${WITH_QT5} \ -DENABLE_MODELTEST=${WITH_MODEL_TEST} \
-DENABLE_PGTEST=${WITH_QT5} \ -DENABLE_PGTEST=${WITH_PG_TEST} \
-DENABLE_MSSQLTEST=${WITH_QT5} \ -DENABLE_MSSQLTEST=${WITH_MSSQL_TEST} \
-DENABLE_MSSQLTEST_CPP=${WITH_QT5} \ -DENABLE_MSSQLTEST_CPP=${WITH_MSSQL_TEST} \
-DENABLE_HANATEST=${WITH_QT5} \ -DENABLE_HANATEST=${WITH_HANA_TEST} \
-DENABLE_ORACLETEST=${WITH_QT5} \ -DENABLE_ORACLETEST=${WITH_ORACLE_TEST} \
-DENABLE_UNITY_BUILDS=${ENABLE_UNITY_BUILDS} \ -DENABLE_UNITY_BUILDS=${ENABLE_UNITY_BUILDS} \
-DPUSH_TO_CDASH=${PUSH_TO_CDASH} \ -DPUSH_TO_CDASH=${PUSH_TO_CDASH} \
-DWITH_HANA=ON \ -DWITH_HANA=ON \
-DWITH_QGIS_PROCESS=ON \ -DWITH_QGIS_PROCESS=ON \
-DWITH_QSPATIALITE=${WITH_QT5} \ -DWITH_QSPATIALITE=${WITH_QSPATIALITE} \
-DWITH_APIDOC=OFF \ -DWITH_APIDOC=OFF \
-DWITH_ASTYLE=OFF \ -DWITH_ASTYLE=OFF \
-DWITH_BINDINGS=ON \ -DWITH_BINDINGS=ON \
-DWITH_SERVER=ON \ -DWITH_SERVER=ON \
-DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_QT5} \ -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_SERVER_LANDINGPAGE_WEBAPP} \
-DWITH_ORACLE=ON \ -DWITH_ORACLE=ON \
-DWITH_PDAL=ON \ -DWITH_PDAL=ON \
-DWITH_QTSERIALPORT=ON \ -DWITH_QTSERIALPORT=ON \

21
.github/workflows/run-tests.yml vendored
View File

@ -55,6 +55,13 @@ jobs:
with-webengine: OFF with-webengine: OFF
with-pdf4qt: OFF with-pdf4qt: OFF
with-compile-commands: ON with-compile-commands: ON
with-model-test: ON
with-pg-test: ON
with-mssql-test: ON
with-hana-test: ON
with-oracle-test: ON
with-qspatialite: ON
with-server-landingpage-webapp: ON
# LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so # LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
experimental: false experimental: false
unity-builds: ON unity-builds: ON
@ -72,6 +79,13 @@ jobs:
with-webengine: ON with-webengine: ON
with-pdf4qt: ON with-pdf4qt: ON
with-compile-commands: OFF with-compile-commands: OFF
with-model-test: OFF
with-pg-test: OFF
with-mssql-test: OFF
with-hana-test: OFF
with-oracle-test: OFF
with-qspatialite: OFF
with-server-landingpage-webapp: OFF
LD_PRELOAD: '' LD_PRELOAD: ''
experimental: false experimental: false
unity-builds: ON unity-builds: ON
@ -168,6 +182,13 @@ jobs:
--env WITH_CLAZY=${{ matrix.with-clazy }} \ --env WITH_CLAZY=${{ matrix.with-clazy }} \
--env WITH_COMPILE_COMMANDS=${{ matrix.with-compile-commands }} \ --env WITH_COMPILE_COMMANDS=${{ matrix.with-compile-commands }} \
--env ENABLE_UNITY_BUILDS=${{ matrix.unity-builds }} \ --env ENABLE_UNITY_BUILDS=${{ matrix.unity-builds }} \
--env WITH_MODEL_TEST=${{ matrix.with-model-test }} \
--env WITH_PG_TEST=${{ matrix.with-pg-test }} \
--env WITH_MSSQL_TEST=${{ matrix.with-mssql-test }} \
--env WITH_HANA_TEST=${{ matrix.with-hana-test }} \
--env WITH_ORACLE_TEST=${{ matrix.with-oracle-test }} \
--env WITH_QSPATIALITE=${{ matrix.with-qspatialite-test }} \
--env WITH_SERVER_LANDINGPAGE_WEBAPP=${{ matrix.with-server-landingpage-webapp }} \
qgis3-build-deps \ qgis3-build-deps \
/root/QGIS/.docker/docker-qgis-build.sh /root/QGIS/.docker/docker-qgis-build.sh