Merge remote-tracking branch 'upstream/master' into hdf5

.gitignore

@@ -76,6 +76,7 @@ build
 Makefile
 doc/build
 bin/
+lib/
 test/unit/CMakeScripts/
 src/gitsha.cpp
 .vagrant/

CMakeLists.txt

@@ -190,13 +190,14 @@ else()
             "${CMAKE_CXX_COMPILER}" MATCHES "clang")
          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PDAL_COMMON_CXX_FLAGS}")
          set(PDAL_COMPILER_CLANG 1)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     endif()
 endif(WIN32)
 
 if (APPLE)
     set(SO_EXT dylib)
     set(CMAKE_FIND_FRAMEWORK "LAST")
+    set(CMAKE_MACOSX_RPATH 1) 
 elseif(WIN32)
     set(SO_EXT dll)
 else()
@@ -227,7 +228,7 @@ if(WIN32)
 endif(WIN32)
 
 if (NOT PDAL_EMBED_BOOST)
-  find_package(Boost 1.53 COMPONENTS program_options thread iostreams filesystem system unit_test_framework random)
+  find_package(Boost 1.52 COMPONENTS program_options thread iostreams filesystem system unit_test_framework random)
 endif()
 
 if(Boost_FOUND)
@@ -280,6 +281,11 @@ if(WITH_PCL)
         include_directories(${PCL_INCLUDE_DIRS})
         link_directories(${PCL_LIBRARY_DIRS})
         add_definitions(${PCL_DEFINITIONS})
+        if (NOT PDAL_EMBED_BOOST)
+            # PCL's configuration clobbers Boost find_package - do it again
+          find_package(Boost 1.52 COMPONENTS program_options thread iostreams filesystem system unit_test_framework random)
+        endif()
+
         message(STATUS "...building with PCL")
     else()
         set(PCL_LIBRARIES "")

CONTRIBUTING.md

@@ -0,0 +1,45 @@
+# How to contribute
+
+PDAL welcomes all contributions.
+We use Github's [pull requests](https://help.github.com/articles/using-pull-requests) to accept patches from the community.
+
+## Getting Started
+
+* Make sure you have a [GitHub account](https://github.com/signup/free).
+* Fork the repository on GitHub.
+
+## Making Changes
+
+* Create a topic branch from where you want to base your work.
+  * You usually should base your topic branch off of the master branch.
+  * To quickly create a topic branch: `git checkout -b my-topic-branch`
+* Make commits of logical units.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are in the [proper format](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* Make sure you have added the necessary tests for your changes.
+* [Run _all_ the tests](http://www.pdal.io/development/testing.html) to assure nothing else was accidentally broken.
+
+## Submitting Changes
+
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request to the repository in the PDAL organization.
+  * If your pull request fixes/references an issue, include that issue number in the pull request. For example:
+
+```
+Wiz the bang
+
+Fixes #123.
+```
+
+* PDAL developers will look at your patch and take an appropriate action.
+
+## Additional Resources
+
+* [PDAL's coding conventions](http://www.pdal.io/development/conventions.html)
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* #pdal IRC channel on freenode.org
+
+## Acknowledgements
+
+The basic skeleton of this CONTRIBUTING file was lifted directly from [Puppet's](https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md).

cmake/examples/cleanup-cmake.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Clean stuff up
+
+find . -name cmake_install.cmake -exec rm {} \;
+find . -name CMakeCache.txt -exec rm {} \;
+find . -name CMakeFiles -exec rm -rf {} \;

hobu-config.sh → cmake/examples/hobu-config.sh

@@ -9,8 +9,8 @@ HEXER_HOME="/Users/hobu/dev/git/hexer"
 SQLITE_HOME="/usr/local/opt/sqlite"
 SO_EXT=dylib
 EMBED=ON
-CC=/Users/hobu/bin/clang
-CXX=/Users/hobu/bin/clang++
+# CC=/usr/local/bin/gcc-4.8
+# CXX=/usr/local/bin/g++-4.8
 
 ORACLE_HOME=$HOME/oracle
 export ORACLE_HOME
@@ -21,7 +21,7 @@ if ! [ -z "$1" ]; then
     CONFIG="$1"
 fi
 
-cmake   -G "$CONFIG"  \
+CC=$CC CXX=$CXX cmake   -G "$CONFIG"  \
         -DCMAKE_BUILD_TYPE=Debug \
         -DCMAKE_INSTALL_PREFIX=/Users/hobu \
         -DWITH_ORACLE=ON \
@@ -32,9 +32,9 @@ cmake   -G "$CONFIG"  \
         -DWITH_NITRO=ON \
         -DWITH_MRSID=ON \
         -DWITH_PCL=ON \
-        -DPCL_DIR=/Users/hobu/dev/git/pcl/include \
+        -DPCL_DIR=/Users/hobu/dev/git/pcl/installed/share/pcl-1.7/ \
         -DMRSID_INCLUDE_DIR=/Users/hobu/dev/release/mrsid/Lidar_DSDK/include \
-        -DMRSID_LIBRRARY=/Users/hobu/dev/release/mrsid/Lidar_DSDK/lib/liblti_lidar_dsdk.dylib \
+        -DMRSID_LIBRARY=/Users/hobu/dev/release/mrsid/Lidar_DSDK/lib/liblti_lidar_dsdk.dylib \
         -DHEXER_INCLUDE_DIR=${HEXER_HOME}/include \
         -DHEXER_LIBRARY=${HEXER_HOME}/bin/libhexer.${SO_EXT} \
         -DGEOTIFF_INCLUDE_DIR=${GEOTIFF_HOME}/include/ \

doc/apps.txt

@@ -109,6 +109,7 @@ Print three selected points of the file as `reStructuredText`_
 
 
 .. _`reStructuredText`: http://docutils.sourceforge.net/docs/user/rst/quickref.html
+
 :: 
 
     -p [ --point ] [=arg(=0)] point to dump
@@ -172,6 +173,10 @@ A simple CSV-style text is output with delta information:
      Mean       0.0000            0.0000            0.0000
     ----------- --------------- --------------- --------------
 
+::
+
+        [hobu@pyro pdal (master)]$ ./bin/pdal delta test/data/1.2-with-color.las test/data/1.2-with-color.las --detail
+
 ::
 
     "ID","DeltaX","DeltaY","DeltaZ"