build with 3D on Travis

qgis · Feb 15, 2018 · 7a67acd · 7a67acd
1 parent 779aa90
commit 7a67acd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
@@ -39,6 +39,7 @@ echo "travis_fold:start:cmake"
 echo "${bold}Running cmake...${endbold}"
 cmake \
  -GNinja \
+ -DWITH_3D=ON \
  -DWITH_STAGED_PLUGINS=ON \
  -DWITH_GRASS=OFF \
  -DSUPPRESS_QT_WARNINGS=ON \

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -3,11 +3,12 @@ MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
 LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
 
+# && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
+# && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
+# && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
+
 RUN  apt-get update \
   && apt-get install -y software-properties-common \
-  && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
-  && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
-  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
   && apt-get update \
   && apt-get install -y \
     bison \
@@ -30,6 +31,7 @@ RUN  apt-get update \
     libproj-dev \
     libqca-qt5-2-dev \
     libqca-qt5-2-plugins \
+    libqt53drender5 \
     libqt5opengl5-dev \
     libqt5scintilla2-dev \
     libqt5sql5-sqlite \
@@ -67,6 +69,11 @@ RUN  apt-get update \
     python3-sip-dev \
     python3-termcolor \
     python3-yaml \
+    qt3d5-dev \
+    qt3d-assimpsceneimport-plugin \
+    qt3d-defaultgeometryloader-plugin \
+    qt3d-gltfsceneio-plugin \
+    qt3d-scene2d-plugin \
     qt5keychain-dev \
     qtbase5-dev \
     qtpositioning5-dev \

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 
-# CACHE_TAG is provided by Docker cloud
+# CACHE_TAG is provided by Docker cloud
 # see https://docs.docker.com/docker-cloud/builds/advanced/
-# using ARG in FROM requires min v17.05.0-ce
+# using ARG in FROM requires min v17.05.0-ce
 ARG  CACHE_TAG=latest
 
 FROM  qgis/qgis3-build-deps:${CACHE_TAG}
@@ -18,10 +18,12 @@ WORKDIR /usr/src/QGIS/build
 
 RUN cmake \
  -GNinja \
+ -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=/usr \
  -DBINDINGS_GLOBAL_INSTALL=ON \
  -DWITH_STAGED_PLUGINS=ON \
  -DWITH_GRASS=ON \
+ -DWITH_3D=ON \
  -DSUPPRESS_QT_WARNINGS=ON \
  -DENABLE_TESTS=OFF \
  -DWITH_QSPATIALITE=ON \