reflect renamed options, update vagrant scripts

PDAL · Nov 4, 2014 · 52afad1 · 52afad1
1 parent 238df4b
commit 52afad1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/scripts/ci/script.sh b/scripts/ci/script.sh
@@ -8,15 +8,9 @@ cd _build || exit 1
 case "$PDAL_OPTIONAL_COMPONENTS" in
     all)
         OPTIONAL_COMPONENT_SWITCH=ON
-        STUBS_SWITCH=OFF
         ;;
-#    stubs_only)
-#        OPTIONAL_COMPONENT_SWITCH=OFF
-#        STUBS_SWITCH=ON
-#        ;;
     none)
         OPTIONAL_COMPONENT_SWITCH=OFF
-        STUBS_SWITCH=OFF
         ;;
     *)
         echo "Unrecognized value for PDAL_OPTIONAL_COMPONENTS=$PDAL_OPTIONAL_COMPONENTS"
@@ -29,21 +23,20 @@ then
 fi
 
 cmake \
+    -DBUILD_PLUGIN_ICEBRIDGE=OFF \
+    -DBUILD_PLUGIN_NITRO=$OPTIONAL_COMPONENT_SWITCH \
+    -DBUILD_PLUGIN_OCI=$OPTIONAL_COMPONENT_SWITCH \
+    -DBUILD_PLUGIN_PGPOINTCLOUD=OFF\
+    -DBUILD_PLUGIN_SQLITE=OFF \
+    -DENABLE_CTEST=OFF \
     -DWITH_APPS=ON \
-    -DWITH_TESTS=ON \
-    -DWITH_PKGCONFIG=ON \
+    -DWITH_CARIS=OFF \
     -DWITH_GEOTIFF=$OPTIONAL_COMPONENT_SWITCH \
-    -DWITH_ORACLE=$OPTIONAL_COMPONENT_SWITCH \
     -DWITH_ICONV=$OPTIONAL_COMPONENT_SWITCH \
     -DWITH_LASZIP=$OPTIONAL_COMPONENT_SWITCH \
-    -DWITH_NITRO=$OPTIONAL_COMPONENT_SWITCH \
-    -DWITH_PGPOINTCLOUD=OFF\
+    -DWITH_PKGCONFIG=ON \
     -DWITH_PYTHON=$OPTIONAL_COMPONENT_SWITCH \
-    -DWITH_CARIS=OFF \
-    -DWITH_SQLITE=OFF \
-    -DENABLE_CTEST=OFF \
-    -DWITH_HDF5=OFF \
-    -DWITH_STUBS=$STUBS_SWITCH \
+    -DWITH_TESTS=ON \
     -G "$PDAL_CMAKE_GENERATOR" \
     ..
 

diff --git a/scripts/vagrant/pcl.sh b/scripts/vagrant/pcl.sh
@@ -7,11 +7,12 @@ fi
 export NUMTHREADS
 
 
-git clone https://github.com/chambbj/pcl.git pcl
+git clone https://github.com/PointCloudLibrary/pcl.git
 cd pcl
 mkdir build
 cd build
-git checkout pipeline
+git fetch origin --tags
+git checkout tags/pcl-1.7.2
 cmake .. \
     -G "Unix Makefiles" \
     -DCMAKE_BUILD_TYPE=Release \
@@ -23,7 +24,7 @@ cmake .. \
     -DWITH_CUDA:BOOL=OFF \
     -DWITH_LIBUSB:BOOL=OFF \
     -DBUILD_people:BOOL=OFF \
-    -DBUILD_surface:BOOL=OFF \
+    -DBUILD_surface:BOOL=ON \
     -DBUILD_tools:BOOL=OFF \
     -DBUILD_visualization:BOOL=OFF \
     -DBUILD_sample_consensus:BOOL=ON \

diff --git a/scripts/vagrant/pdal.sh b/scripts/vagrant/pdal.sh
@@ -14,7 +14,7 @@ cd build
 cmake   -G "Unix Makefiles"  \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_PCL=ON \
+        -DBUILD_PLUGIN_PCL=ON \
         ..
 
 make -j $NUMTHREADS