activate, oci

PDAL · Oct 23, 2018 · 39f3105 · 39f3105
1 parent b572b4e
commit 39f3105
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -35,7 +35,7 @@ install:
   - python -c "import sys; print(sys.prefix)"
   - conda config --add channels conda-forge
   - conda update -q --all
-  - conda install geotiff laszip nitro curl gdal pcl cmake eigen ninja libgdal geos zstd numpy xz libxml2 laz-perf qhull sqlite hdf5
+  - conda install geotiff laszip nitro curl gdal pcl cmake eigen ninja libgdal geos zstd numpy xz libxml2 laz-perf qhull sqlite hdf5 oracle-instantclient
   - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   - call scripts\\appveyor\\config.cmd
 

diff --git a/scripts/appveyor/config.cmd b/scripts/appveyor/config.cmd
@@ -9,7 +9,8 @@ SET CMAKE_BUILD_TYPE=RelWithDebInfo
 mkdir build
 pushd build
 
-conda activate base
+activate base
+set ORACLE_HOME=%CONDA_ROOT%
 
 cmake -G "NMake Makefiles" ^
     -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
@@ -27,6 +28,7 @@ cmake -G "NMake Makefiles" ^
     -DBUILD_PLUGIN_NITF=ON ^
     -DBUILD_PLUGIN_PCL=ON ^
     -DBUILD_PLUGIN_PGPOINTCLOUD=ON ^
+    -DBUILD_PLUGIN_OCI=ON ^
     -DBUILD_PLUGIN_SQLITE=ON ^
     -DBUILD_PLUGIN_I3S=ON ^
     -DBUILD_PLUGIN_RIVLIB=OFF ^