Merge remote-tracking branch 'origin/winfix' into readers.numpy

CMakeLists.txt

@@ -85,7 +85,6 @@ if(WIN32)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE} "${PDAL_OUTPUT_BIN_DIR}")
   # ---[ Windows requires DLLs (shared libraries) to be installed in
   # ---[ the same directory as executables
-  message("*** CONFIG RUNTIME OUTPUT = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE}} ***")
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE} "${PDAL_OUTPUT_BIN_DIR}")
 endif(WIN32)
 

appveyor.yml

@@ -35,18 +35,15 @@ install:
   - ps: mkdir C:\temp | out-null
   - ps: mkdir $env:OSGEO4W_ROOT | out-null
   # make an install directory for packacing
-  - ps: mkdir C:\pdalbin | out-null
   # 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,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\
+  - set PATH=%PATH%;C:\Program Files (x86)\CMake\bin
   - call scripts\\appveyor\\config.cmd
-  - cd
 
 build_script:
   - call scripts\\appveyor\\build.cmd

scripts/appveyor/config.cmd

@@ -14,6 +14,7 @@ set PDAL_BUILD_TESTS=OFF
 
 ) ELSE (
 
+mkdir C:\pdalbin
 SET PDAL_PLUGIN_INSTALL_PATH="C:\pdalbin"
 set PDAL_BUILD_TESTS=ON
 
@@ -37,12 +38,13 @@ 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 ^
+    -DLIBLZMA_LIBRARY=%OSGEO4W_ROOT%\lib\liblzma.lib ^
     -DBUILD_PLUGIN_RIVLIB=OFF ^
     -DBUILD_PLUGIN_PYTHON=%PDAL_OPTIONAL_COMPONENTS% ^
     -DENABLE_CTEST=OFF ^
     -DWITH_LAZPERF=ON ^
-	-DLazperf_DIR=%OSGEO4W_ROOT% ^
+    -DLazperf_DIR=%OSGEO4W_ROOT% ^
+    -DWITH_LZMA=ON ^
     -DWITH_LASZIP=ON ^
     -DWITH_TESTS=%PDAL_BUILD_TESTS% ^
 	-DPDAL_PLUGIN_INSTALL_PATH=%PDAL_PLUGIN_INSTALL_PATH% ^
@@ -67,4 +69,3 @@ cmake -G "NMake Makefiles" ^
 
 popd
 
-echo "Exiting config"

scripts/appveyor/test.cmd

@@ -1,9 +1,3 @@
-REM set PATH=%OSGEO4W_ROOT%\bin;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\
-REM call %OSGEO4W_ROOT%\bin\o4w_env.bat
-REM call %OSGEO4W_ROOT%\bin\py3_env.bat
-REM set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-REM 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\
-
 pushd build
 
 ctest -V --output-on-failure