File tree 3 files changed +15
-5
lines changed
3 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ echo "travis_fold:start:cmake"
39
39
echo " ${bold} Running cmake...${endbold} "
40
40
cmake \
41
41
-GNinja \
42
+ -DWITH_3D=ON \
42
43
-DWITH_STAGED_PLUGINS=ON \
43
44
-DWITH_GRASS=OFF \
44
45
-DSUPPRESS_QT_WARNINGS=ON \
Original file line number Diff line number Diff line change @@ -3,11 +3,12 @@ MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
3
3
4
4
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
5
5
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
+
6
10
RUN apt-get update \
7
11
&& 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 \
11
12
&& apt-get update \
12
13
&& apt-get install -y \
13
14
bison \
@@ -30,6 +31,7 @@ RUN apt-get update \
30
31
libproj-dev \
31
32
libqca-qt5-2-dev \
32
33
libqca-qt5-2-plugins \
34
+ libqt53drender5 \
33
35
libqt5opengl5-dev \
34
36
libqt5scintilla2-dev \
35
37
libqt5sql5-sqlite \
@@ -67,6 +69,11 @@ RUN apt-get update \
67
69
python3-sip-dev \
68
70
python3-termcolor \
69
71
python3-yaml \
72
+ qt3d5-dev \
73
+ qt3d-assimpsceneimport-plugin \
74
+ qt3d-defaultgeometryloader-plugin \
75
+ qt3d-gltfsceneio-plugin \
76
+ qt3d-scene2d-plugin \
70
77
qt5keychain-dev \
71
78
qtbase5-dev \
72
79
qtpositioning5-dev \
Original file line number Diff line number Diff line change 1
1
2
- # CACHE_TAG is provided by Docker cloud
2
+ # CACHE_TAG is provided by Docker cloud
3
3
# 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
5
5
ARG CACHE_TAG=latest
6
6
7
7
FROM qgis/qgis3-build-deps:${CACHE_TAG}
@@ -18,10 +18,12 @@ WORKDIR /usr/src/QGIS/build
18
18
19
19
RUN cmake \
20
20
-GNinja \
21
+ -DCMAKE_BUILD_TYPE=Release \
21
22
-DCMAKE_INSTALL_PREFIX=/usr \
22
23
-DBINDINGS_GLOBAL_INSTALL=ON \
23
24
-DWITH_STAGED_PLUGINS=ON \
24
25
-DWITH_GRASS=ON \
26
+ -DWITH_3D=ON \
25
27
-DSUPPRESS_QT_WARNINGS=ON \
26
28
-DENABLE_TESTS=OFF \
27
29
-DWITH_QSPATIALITE=ON \
You can’t perform that action at this time.
0 commit comments