make GDAL be required for Travis

PDAL · Oct 14, 2014 · a7e0ddb · a7e0ddb
1 parent e00ea19
commit a7e0ddb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh
@@ -40,11 +40,16 @@ else
     sudo apt-get install cmake
 fi
 
+
+# GDAL is now always required
+sudo apt-get install \
+    libgdal1h \
+    libgdal-dev
+
+
 if [[ $PDAL_OPTIONAL_COMPONENTS == "all" ]]
 then
     sudo apt-get install \
-        libgdal1h \
-        libgdal-dev \
         libhdf5-serial-dev \
         libproj-dev \
         libgeos++-dev \

diff --git a/scripts/ci/script.sh b/scripts/ci/script.sh
@@ -32,7 +32,7 @@ cmake \
     -DWITH_APPS=ON \
     -DWITH_TESTS=ON \
     -DWITH_PKGCONFIG=ON \
-    -DWITH_GDAL=$OPTIONAL_COMPONENT_SWITCH \
+    -DWITH_GDAL=ON \
     -DWITH_GEOTIFF=$OPTIONAL_COMPONENT_SWITCH \
     -DWITH_ORACLE=$OPTIONAL_COMPONENT_SWITCH \
     -DWITH_ICONV=$OPTIONAL_COMPONENT_SWITCH \