From b3a578c4e4ef02184e7127f2e41cb04b90d272ed Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 10 Feb 2021 14:14:36 +1000 Subject: [PATCH 1/3] Enable PDAL on CI --- .docker/docker-qgis-build.sh | 1 + .docker/qgis3-build-deps.dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh index 85e1cd3f16fb..031080f99b0b 100755 --- a/.docker/docker-qgis-build.sh +++ b/.docker/docker-qgis-build.sh @@ -58,6 +58,7 @@ CMAKE_ARGS=( "-DWITH_BINDINGS=ON" "-DWITH_SERVER=ON" "-DWITH_ORACLE=ON" + "-DWITH_PDAL=ON" "-DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/" "-DORACLE_LIBDIR=/instantclient_19_9/" "-DDISABLE_DEPRECATED=ON" diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile index 897cc89e268f..151ba4d54ff3 100644 --- a/.docker/qgis3-build-deps.dockerfile +++ b/.docker/qgis3-build-deps.dockerfile @@ -35,6 +35,7 @@ RUN apt-get update \ libgdal-dev \ libgeos-dev \ libgsl-dev \ + libpdal-dev \ libpq-dev \ libproj-dev \ libprotobuf-dev \ From 37084d0a9c880ed5d905bd0f85bab02455721d62 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 10 Feb 2021 14:41:04 +1000 Subject: [PATCH 2/3] pdal --- .docker/qgis3-build-deps.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile index 151ba4d54ff3..0c3b8aa558cc 100644 --- a/.docker/qgis3-build-deps.dockerfile +++ b/.docker/qgis3-build-deps.dockerfile @@ -66,6 +66,7 @@ RUN apt-get update \ lighttpd \ locales \ ninja-build \ + pdal \ pkg-config \ poppler-utils \ postgresql-client \ From db6a635d134e9ecbee03faae66d355c3c6033287 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 10 Feb 2021 15:07:24 +1000 Subject: [PATCH 3/3] Avoid unused variable warning --- external/untwine/api/QgisUntwine_unix.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/external/untwine/api/QgisUntwine_unix.cpp b/external/untwine/api/QgisUntwine_unix.cpp index 16c536fc17da..fbf1f26f0308 100644 --- a/external/untwine/api/QgisUntwine_unix.cpp +++ b/external/untwine/api/QgisUntwine_unix.cpp @@ -15,6 +15,7 @@ bool QgisUntwine::start(Options& options) { int fd[2]; int ret = ::pipe(fd); + (void)ret; m_pid = ::fork();