Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/branch-7-4'

  • Loading branch information...
jmckenna committed Jun 12, 2019
2 parents 51f0ce0 + 6f879de commit aea4479dd16aa07c4cc819a6d4d801756e9be12a
Showing with 2 additions and 2 deletions.
  1. +1 −1 cmake/FindOracle.cmake
  2. +1 −1 mapscript/python/README.rst
@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME})
${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

set(ORACLE_OCI_NAMES clntsh libclntsh oci)
set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32)
set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32)
set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)

set(ORACLE_LIB_DIR
@@ -254,4 +254,4 @@ Credits
+ Thomas Bonfort (developer)
+ Even Rouault (developer)
+ Seth Girvin (Python3 migration, documentation and builds)
+ Claude Paroz (Python3 migration)
+ Claude Paroz (Python3 migration)

0 comments on commit aea4479

Please sign in to comment.
You can’t perform that action at this time.