don't set PDAL_DRIVER_PATH on configure for appveyor

PDAL · Oct 24, 2018 · 4c5ebfb · 4c5ebfb
1 parent a98b329
commit 4c5ebfb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cmake/examples/hobu-conda-win64.bat b/cmake/examples/hobu-conda-win64.bat
@@ -1,4 +1,4 @@
-REM del /s /q build
+del /s /q build-project
 mkdir build-project
 cd build-project
 
@@ -11,7 +11,7 @@ set ORACLE_HOME=%CONDA_ROOT%
 cmake -G %GENERATOR% ^
       -DCMAKE_INSTALL_PREFIX:PATH="%CONDA_ROOT%" ^
       -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo ^
-      -DCMAKE_LIBRARY_PATH:FILEPATH="=%CONDA_ROOT%/Library/lib" ^
+      -DCMAKE_LIBRARY_PATH:FILEPATH="=%CONDA_ROOT%/Library/lib"ninj ^
       -DCMAKE_INCLUDE_PATH:FILEPATH="%CONDA_ROOT%/Library/include" ^
       -DBUILD_PLUGIN_GREYHOUND=ON ^
       -DBUILD_PLUGIN_PCL=ON ^
@@ -28,6 +28,7 @@ cmake -G %GENERATOR% ^
 	-DORACLE_INCLUDE_DIR=%CONDA_ROOT%/include ^
 	-DORACLE_LIBRARY=%CONDA_ROOT%/libs/oci.lib ^
     -DLazperf_DIR=%CONDA_ROOT%/Library/cmake ^
+	-DPYTHON_DEBUG_LIBRARY= ^
     -DHDF5_DIR=%CONDA_ROOT%/Library/cmake ^
     -DPCL_DIR=%CONDA_ROOT%/Library/cmake ^
     -DWITH_ZLIB=ON ^

diff --git a/plugins/nitf/test/NitfReaderTest.cpp b/plugins/nitf/test/NitfReaderTest.cpp
@@ -58,7 +58,7 @@ TEST(NitfReaderTest, test_one)
     PointTable table;
 
     Stage* nitf_reader(f.createStage("readers.nitf"));
-    EXPECT_NEQ(nitf_reader,0);
+    EXPECT_NE((int)nitf_reader,0);
     nitf_reader->setOptions(nitf_opts);
     nitf_reader->prepare(table);
     PointViewSet pbSet = nitf_reader->execute(table);

diff --git a/scripts/appveyor/config.cmd b/scripts/appveyor/config.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 SET PDAL_INSTALL_PREFIX="C:/temp/install"
-SET PDAL_PLUGIN_INSTALL_PATH="C:/temp/install/bin"
+REM SET PDAL_PLUGIN_INSTALL_PATH="C:/temp/install/bin"
 SET PDAL_BUILD_TESTS=ON
 SET CMAKE_VERBOSE_MAKEFILE=OFF
 SET CMAKE_BUILD_TYPE=RelWithDebInfo