Merge remote-tracking branch 'origin/master' into compression

CMakeLists.txt

@@ -58,6 +58,7 @@ endif()
 set(PDAL_UTIL_LIB_NAME pdal_util)
 set(PDAL_BOOST_LIB_NAME pdal_boost)
 set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan)
+set(PDAL_TEST_SUPPORT_OBJS pdal_test_support)
 
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
@@ -178,9 +179,8 @@ if (NOT PDAL_HAVE_JSONCPP)
     add_subdirectory(vendor/jsoncpp/dist)
 endif()
 add_subdirectory(pdal/util)
-#add_subdirectory(tools)
+add_subdirectory(tools)
 add_subdirectory(apps)
-
 #
 # On OSX we reexport the symbols in libpdal_util.dylib into libpdalcpp.dylib
 # so that users only need link libpdalcpp.
@@ -265,6 +265,15 @@ set_target_properties(${PDAL_BASE_LIB_NAME} PROPERTIES
     VERSION ${PDAL_BUILD_VERSION}
     SOVERSION ${PDAL_API_VERSION}
     CLEAN_DIRECT_OUTPUT 1)
+
+
+
+if (WITH_EXAMPLES)
+    add_subdirectory(examples)
+endif()
+
+
+
 #
 # On Linux, we install a linker script as libpdalcpp.so.  That file
 # specifies linking in libpdal_base.so and libpdal_util.so.  This allows

appveyor.yml

@@ -39,22 +39,21 @@ install:
   # get the OSGeo installer
   - ps: (new-object net.webclient).DownloadFile("http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe", "C:\temp\osgeo4w-setup.exe")
   # and install our dependencies
-  - C:\temp\osgeo4w-setup.exe -q -k -r -A -s http://download.osgeo.org/osgeo4w/ -a x86_64 -P eigen,gdal,geos,hexer,iconv,laszip,libgeotiff,libpq,libtiff,libxml2,msys,nitro,laz-perf,proj,zlib,python3-core,python3-devel,python3-numpy,oci,oci-devel,xz-devel,zstd -R %OSGEO4W_ROOT% > NUL
+  - C:\temp\osgeo4w-setup.exe -q -k -r -A -s http://download.osgeo.org/osgeo4w/ -a x86_64 -P eigen,gdal,geos,hexer,iconv,laszip,libgeotiff,libpq,libtiff,libxml2,msys,nitro,laz-perf,proj,zlib,python3-core,python3-devel,python3-numpy,oci,oci-devel,laz-perf,jsoncpp,xz-devel,zstd -R %OSGEO4W_ROOT% > NUL
   # call our PDAL install script
   - call %OSGEO4W_ROOT%\bin\o4w_env.bat
   - call %OSGEO4W_ROOT%\bin\py3_env.bat
   - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   - set PATH=%PATH%;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft Windows Performance Toolkit\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Tools\GitVersion;C:\Program Files (x86)\CMake\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\AppVeyor\BuildAgent\
   - call .\\scripts\\appveyor\\config.cmd
 
-build:
-  parallel: true
-  project: PDAL.sln
-  verbosity: minimal
+build_script:
+  - call .\\scripts\\appveyor\\build.cmd
 
 after_build:
   - call %OSGEO4W_ROOT%\bin\o4w_env.bat
-  - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+  - call %OSGEO4W_ROOT%\bin\py3_env.bat
+  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   - set PATH=%PATH%;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft Windows Performance Toolkit\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Tools\GitVersion;C:\Program Files (x86)\CMake\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\AppVeyor\BuildAgent\
   - call .\\scripts\\appveyor\\install.cmd
 

cmake/examples/hobu-config.sh

@@ -42,6 +42,7 @@ CC=$CC CXX=$CXX cmake   -G "$CONFIG"  \
         -DBUILD_PLUGIN_OPENSCENEGRAPH=OFF \
         -DWITH_LAZPERF=ON \
         -DWITH_LASZIP=ON \
+        -DWITH_EXAMPLES=ON \
         -DMRSID_INCLUDE_DIR=/Users/hobu/dev/release/mrsid/Lidar_DSDK/include \
         -DMRSID_LIBRARY=/Users/hobu/dev/release/mrsid/Lidar_DSDK/lib/liblti_lidar_dsdk.dylib \
         -DHEXER_INCLUDE_DIR=${HEXER_HOME}/include \

cmake/examples/hobu-windows.bat

@@ -80,20 +80,20 @@ cmake -G %GENERATOR% ^
     -DENABLE_CTEST=OFF ^
     -DWITH_APPS=ON ^
     -DWITH_LAZPERF=ON ^
-	-DLazperf_DIR=c:\pdalbin\cmake ^
+    -DLazperf_DIR=%OSGEO4W_DIR%/cmake ^
     -DWITH_LASZIP=ON ^
     -DWITH_TESTS=ON ^
-	-DPYTHON_EXECUTABLE=%OSGEO4W_DIR%\apps\python36\python.exe ^
-	-DPYTHON_INCLUDE_DIR=%OSGEO4W_DIR%\apps\python36\include ^
-	-DPYTHON_LIBRARY=%OSGEO4W_DIR%\apps\python36\libs\python36.lib ^
-	-DPYTHON_DEBUG_LIBRARY=%OSGEO4W_DIR%\apps\python36\libs\python36.lib ^
-	-DCURL_INCLUDE_DIR=%CURL_INCLUDE_DIR% ^
-	-DCURL_LIBRARY=%CURL_LIBRARY% ^
-	-DNUMPY_INCLUDE_DIR=%OSGEO4W_DIR%\apps\python36\lib\site-packages\numpy\core\include ^
-	-DNUMPY_VERSION=1.11.1 ^
+    -DPYTHON_EXECUTABLE=%OSGEO4W_DIR%\apps\python36\python.exe ^
+    -DPYTHON_INCLUDE_DIR=%OSGEO4W_DIR%\apps\python36\include ^
+    -DPYTHON_LIBRARY=%OSGEO4W_DIR%\apps\python36\libs\python36.lib ^
+    -DPYTHON_DEBUG_LIBRARY=%OSGEO4W_DIR%\apps\python36\libs\python36.lib ^
+    -DCURL_INCLUDE_DIR=%CURL_INCLUDE_DIR% ^
+    -DCURL_LIBRARY=%CURL_LIBRARY% ^
+    -DNUMPY_INCLUDE_DIR=%OSGEO4W_DIR%\apps\python36\lib\site-packages\numpy\core\include ^
+    -DNUMPY_VERSION=1.11.1 ^
     -Dgtest_force_shared_crt=ON ^
-    -DCMAKE_INSTALL_PREFIX=C:\projects\pdal\install ^
+    -DCMAKE_INSTALL_PREFIX=c:\OSGeo4W64\ ^
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
     -DCMAKE_VERBOSE_MAKEFILE=OFF ^
     .
-	
+

cmake/macros.cmake

@@ -162,14 +162,12 @@ macro(PDAL_ADD_TEST _name)
     set(oneValueArgs)
     set(multiValueArgs FILES LINK_WITH)
     cmake_parse_arguments(PDAL_ADD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    set(common_srcs
-        ${PROJECT_SOURCE_DIR}/test/unit/Support.cpp
-    )
     if (WIN32)
         list(APPEND ${PDAL_ADD_TEST_FILES} ${PDAL_TARGET_OBJECTS})
         add_definitions("-DPDAL_DLL_EXPORT=1")
     endif()
-    add_executable(${_name} ${PDAL_ADD_TEST_FILES} ${common_srcs})
+    add_executable(${_name} ${PDAL_ADD_TEST_FILES}
+        $<TARGET_OBJECTS:${PDAL_TEST_SUPPORT_OBJS}>)
     target_include_directories(${_name} PRIVATE
         ${ROOT_DIR}
         ${PDAL_INCLUDE_DIR}

dimbuilder/CMakeLists.txt

@@ -28,8 +28,8 @@ target_include_directories(dimbuilder PRIVATE
     ${PDAL_JSONCPP_INCLUDE_DIR})
 PDAL_TARGET_COMPILE_SETTINGS(dimbuilder)
 if (PDAL_HAVE_JSONCPP)
-    target_link_libraries(dimbuilder PRIVATE ${PDAL_JSONCPP_LIB_NAME})
+    target_link_libraries(dimbuilder ${JSON_CPP_LINK_TYPE} ${PDAL_JSONCPP_LIB_NAME})
 endif()
 if (UNIX AND NOT APPLE)
-    target_link_libraries(dimbuilder PRIVATE dl)
+    target_link_libraries(dimbuilder PRIVATE  ${CMAKE_DL_LIBS})
 endif()

doc/development/using.rst → doc/development/cmake.rst

@@ -1,7 +1,7 @@
 .. _using:
 
 ===============================================================================
-Using PDAL with CMake
+CMake
 ===============================================================================
 
 :Author: Bradley Chambers