Merge remote-tracking branch 'origin/azure-pipelines' into azure-pipe…

…lines
PDAL · Jun 27, 2019 · bd20d28 · bd20d28
2 parents 507f4ef + 582bbef
commit bd20d28
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/io/EptReader.cpp b/io/EptReader.cpp
@@ -412,8 +412,8 @@ void EptReader::addDimensions(PointLayoutPtr layout)
             const arbiter::Endpoint ep(m_arbiter->getEndpoint(root));
             try
             {
-                const NL::json addonInfo
-                    { NL::json::parse(ep.get(addonFilename)) };
+                const NL::json addonInfo(
+                    NL::json::parse(ep.get(addonFilename)));
                 const Dimension::Type type(getRemoteType(addonInfo));
                 const Dimension::Id id(
                     layout->registerOrAssignDim(dimName, type));

diff --git a/plugins/oci/CMakeLists.txt b/plugins/oci/CMakeLists.txt
@@ -36,6 +36,7 @@ PDAL_ADD_PLUGIN(writer_libname writer oci
         ${LIBXML2_LIBRARIES}
     INCLUDES
         ${ORACLE_INCLUDE_DIR}
+        ${PDAL_VENDOR_DIR}/eigen
         ${PDAL_VENDOR_DIR}/pdalboost
         ${LIBXML2_INCLUDE_DIR}
 )

diff --git a/scripts/azp/win.yml b/scripts/azp/win.yml
@@ -1,6 +1,7 @@
 
 jobs:
 - job: win
+
   pool:
     vmImage: vs2017-win2016
   timeoutInMinutes: 360
@@ -76,4 +77,12 @@ jobs:
         set CXX=cl.exe
         ninja
       displayName: 'Build'
+    - script: |
+        call activate pdal
+        pushd build
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+        set PYTHONHOME='C:/Miniconda/envs/pdal/'
+        set PYTHONLIB= 'C:/Miniconda/envs/pdal/Lib'
+        ctest -V --output-on-failure
+      displayName: 'Test'