Skip to content

Commit 6ea5680

Browse files
committed
build with 3D on Travis
1 parent d62ad0b commit 6ea5680

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

.ci/travis/linux/docker-build-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ echo "travis_fold:start:cmake"
3939
echo "${bold}Running cmake...${endbold}"
4040
cmake \
4141
-GNinja \
42+
-DWITH_3D=ON \
4243
-DWITH_STAGED_PLUGINS=ON \
4344
-DWITH_GRASS=OFF \
4445
-DSUPPRESS_QT_WARNINGS=ON \

.docker/Dockerfile

+10-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
33

44
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
55

6+
# && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
7+
# && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
8+
# && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
9+
610
RUN apt-get update \
711
&& apt-get install -y software-properties-common \
8-
&& echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
9-
&& echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
10-
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
1112
&& apt-get update \
1213
&& apt-get install -y \
1314
bison \
@@ -30,6 +31,7 @@ RUN apt-get update \
3031
libproj-dev \
3132
libqca-qt5-2-dev \
3233
libqca-qt5-2-plugins \
34+
libqt53drender5 \
3335
libqt5opengl5-dev \
3436
libqt5scintilla2-dev \
3537
libqt5sql5-sqlite \
@@ -67,6 +69,11 @@ RUN apt-get update \
6769
python3-sip-dev \
6870
python3-termcolor \
6971
python3-yaml \
72+
qt3d5-dev \
73+
qt3d-assimpsceneimport-plugin \
74+
qt3d-defaultgeometryloader-plugin \
75+
qt3d-gltfsceneio-plugin \
76+
qt3d-scene2d-plugin \
7077
qt5keychain-dev \
7178
qtbase5-dev \
7279
qtpositioning5-dev \

Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
# CACHE_TAG is provided by Docker cloud
2+
# CACHE_TAG is provided by Docker cloud
33
# see https://docs.docker.com/docker-cloud/builds/advanced/
4-
# using ARG in FROM requires min v17.05.0-ce
4+
# using ARG in FROM requires min v17.05.0-ce
55
ARG CACHE_TAG=latest
66

77
FROM qgis/qgis3-build-deps:${CACHE_TAG}
@@ -18,10 +18,12 @@ WORKDIR /usr/src/QGIS/build
1818

1919
RUN cmake \
2020
-GNinja \
21+
-DCMAKE_BUILD_TYPE=Release \
2122
-DCMAKE_INSTALL_PREFIX=/usr \
2223
-DBINDINGS_GLOBAL_INSTALL=ON \
2324
-DWITH_STAGED_PLUGINS=ON \
2425
-DWITH_GRASS=ON \
26+
-DWITH_3D=ON \
2527
-DSUPPRESS_QT_WARNINGS=ON \
2628
-DENABLE_TESTS=OFF \
2729
-DWITH_QSPATIALITE=ON \

0 commit comments

Comments
 (0)