Merge remote-tracking branch 'origin/master'

PDAL · Nov 30, 2017 · a36bc1e · a36bc1e
2 parents 348eb7b + a61011d
commit a36bc1e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/cmake/examples/hobu-windows.bat b/cmake/examples/hobu-windows.bat
@@ -78,12 +78,12 @@ cmake -G %GENERATOR% ^
     -DBUILD_PLUGIN_RIVLIB=OFF ^
     -DBUILD_PLUGIN_PYTHON=ON ^
     -DENABLE_CTEST=OFF ^
-    -DWITH_APPS=ON ^
     -DWITH_LAZPERF=ON ^
     -DLazperf_DIR=%OSGEO4W_DIR%/cmake ^
     -DWITH_LASZIP=ON ^
     -DWITH_TESTS=ON ^
     -DPYTHON_EXECUTABLE=%OSGEO4W_DIR%\apps\python36\python.exe ^
+	-DLIBLZMA_LIBRARY=%OSGEO4W_DIR%\lib\liblzma.lib ^
     -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 ^
@@ -94,6 +94,6 @@ cmake -G %GENERATOR% ^
     -Dgtest_force_shared_crt=ON ^
     -DCMAKE_INSTALL_PREFIX=c:\OSGeo4W64\ ^
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-    -DCMAKE_VERBOSE_MAKEFILE=OFF ^
+    -DCMAKE_VERBOSE_MAKEFILE=OFF	 ^
     .
 
diff --git a/cmake/modules/FindZSTD.cmake b/cmake/modules/FindZSTD.cmake
@@ -25,14 +25,9 @@
 find_path(ZSTD_INCLUDE_DIR NAMES zstd.h
     PATH_SUFFIXES "include")
 
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
-find_library(ZSTD_STATIC_LIB NAMES zstd
-  PATH_SUFFIXES "lib")
+find_library(ZSTD_LIBRARY NAMES zstd)
 
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
-find_library(ZSTD_SHARED_LIB NAMES zstd
-  PATH_SUFFIXES "lib")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(ZSTD REQUIRED_VARS
-  ZSTD_STATIC_LIB ZSTD_SHARED_LIB ZSTD_INCLUDE_DIR)
+  ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
diff --git a/doc/stages/writers.pcd.rst b/doc/stages/writers.pcd.rst
@@ -42,8 +42,19 @@ filename
   PCD file to write [Required]
 
 compression
-  Apply compression to the PCD file? [Default: false]
+  Level of PCD compression to use (ascii, binary, compressed) [Default: **ascii**]
 
+xyz
+  Write only XYZ dimension? [Default: **false**]
+
+subtract_minimum
+  Set origin to minimum of XYZ dimension? [Default: **true**]
+
+offset_x, offset_y, offset_z
+  Offset to be subtracted from XYZ position [Default: **0.0**]
+
+scale_x, scale_y, scale_z
+  Scale to divide from XYZ dimension [Default: **1.0**]
 
 
 .. _Point Cloud Data (PCD): http://pointclouds.org/documentation/tutorials/pcd_file_format.php

diff --git a/python/setup.py b/python/setup.py
@@ -16,7 +16,6 @@
 import platform
 import sys
 import numpy
-from Cython.Build import cythonize
 
 USE_CYTHON = True
 try:
@@ -190,6 +189,7 @@ def get_pdal_config(option):
         'Topic :: Scientific/Engineering :: GIS',
     ],
     cmdclass           = {},
+    install_requires   = ['numpy', 'packaging'],
 )
 setup(ext_modules=extensions, **setup_args)
 
diff --git a/scripts/appveyor/config.cmd b/scripts/appveyor/config.cmd
@@ -34,6 +34,7 @@ cmake -G "NMake Makefiles" ^
     -DBUILD_PLUGIN_PCL=OFF ^
     -DBUILD_PLUGIN_PGPOINTCLOUD=%PDAL_OPTIONAL_COMPONENTS% ^
     -DBUILD_PLUGIN_SQLITE=%PDAL_OPTIONAL_COMPONENTS% ^
+	-DLIBLZMA_LIBRARY=%OSGEO4W_ROOT%\lib\liblzma.lib ^
     -DBUILD_PLUGIN_RIVLIB=OFF ^
     -DBUILD_PLUGIN_PYTHON=%PDAL_OPTIONAL_COMPONENTS% ^
     -DENABLE_CTEST=OFF ^