linux fixes

PDAL · Jun 27, 2019 · c87a872 · c87a872
1 parent bd20d28
commit c87a872
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/scripts/azp/linux.yml b/scripts/azp/linux.yml
@@ -14,7 +14,7 @@ jobs:
       cd build
       cmake .. \
         -G Ninja \
-        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo\
         -DBUILD_PLUGIN_PYTHON=ON \
         -DBUILD_PLUGIN_CPD=ON \
         -DBUILD_PLUGIN_GREYHOUND=ON \
@@ -24,6 +24,7 @@ jobs:
         -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
         -DBUILD_PLUGIN_E57=ON \
         -DBUILD_PGPOINTCLOUD_TESTS=OFF \
+        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
         -DBUILD_PLUGIN_SQLITE=ON \
         -DWITH_LASZIP=ON \
         -DWITH_LAZPERF=ON \
@@ -35,6 +36,7 @@ jobs:
     displayName: 'Build'
   - script: |
       cd build
+      export PDAL_PYTHON_LIBRARY=/usr/lib/python3.6/config-3.6m-x86_64-linux-gnu/libpython3.6.so
       ctest -V
     displayName: 'Test'
   - script: |

diff --git a/scripts/azp/win.yml b/scripts/azp/win.yml
@@ -78,6 +78,7 @@ jobs:
         ninja
       displayName: 'Build'
     - script: |
+        ECHO ON
         call activate pdal
         pushd build
         call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64

diff --git a/scripts/docker/ubuntu/dependencies/Dockerfile b/scripts/docker/ubuntu/dependencies/Dockerfile
@@ -58,6 +58,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-mi
         libmysqlclient-dev \
         libltdl-dev \
         libcurl4-openssl-dev \
+        libssl-dev \
+        python3-numpy \
         libspatialite-dev \
         libdap-dev\
         cython \
@@ -153,18 +155,15 @@ RUN git clone --depth 1 --branch v0.5.1 https://github.com/gadomski/cpd.git \
     && rm -rf /cpd
 
 
-# Install Java.
-RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
-    add-apt-repository -y ppa:webupd8team/java && \
-    apt-get update && \
-    apt-get install -y oracle-java8-installer && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /var/cache/oracle-jdk8-installer
-
-ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
-
-# fixup for PCL 1.7
-RUN ln -s /usr/lib/x86_64-linux-gnu/libvtkCommonCore-6.3.so /usr/lib/libvtkproj4.so
+RUN \
+    curl -LO https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5.tar.gz && tar zxvf cmake-3.14.5.tar.gz && cd cmake-3.14.5; \
+    ./bootstrap --prefix=/usr && make && make install
 
 
+RUN \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-1.8.zip &&  unzip -j -u -o proj-datumgrid-1.8.zip  -d /usr/share/proj && rm proj-datumgrid-1.8.zip ; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-europe-1.2.zip &&  unzip -j -u -o proj-datumgrid-europe-1.2.zip -d /usr/share/proj && rm proj-datumgrid-europe-1.2.zip ; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip &&  unzip -j -u -o proj-datumgrid-oceania-1.0.zip -d /usr/share/proj && rm proj-datumgrid-oceania-1.0.zip; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip &&  unzip -j -u -o proj-datumgrid-world-1.0.zip -d /usr/share/proj && rm proj-datumgrid-world-1.0.zip; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-north-america-1.2.zip &&  unzip -j -u -o proj-datumgrid-north-america-1.2.zip -d /usr/share/proj && rm proj-datumgrid-north-america-1.2.zip;