From cbdff13db092022d34c9bdbd4a9b9e9055e8fe4d Mon Sep 17 00:00:00 2001 From: Erusman Date: Thu, 2 Jul 2020 19:56:43 -0700 Subject: [PATCH 1/3] add Oracle 19.6 Instant Client to FindOracle.cmake for future use of Oracle 19c Database --- cmake/linux/FindOracle.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/linux/FindOracle.cmake b/cmake/linux/FindOracle.cmake index 0abd11c2..de8a9737 100644 --- a/cmake/linux/FindOracle.cmake +++ b/cmake/linux/FindOracle.cmake @@ -52,6 +52,12 @@ if(DEFINED ENV{ORACLE_HOME}) /usr/share/oracle/12.2/client64 /usr/lib/oracle/12.2/client /usr/share/oracle/12.2/client + /usr/include/oracle/19.6/client64 + /usr/include/oracle/19.6/client + /usr/lib/oracle/19.6/client64 + /usr/share/oracle/19.6/client64 + /usr/lib/oracle/19.6/client + /usr/share/oracle/19.6/client ${ORACLE_HOME}/rdbms/public ${ORACLE_HOME}/include ${ORACLE_HOME}/sdk/include # Oracle SDK @@ -59,8 +65,8 @@ if(DEFINED ENV{ORACLE_HOME}) set(ORACLE_OCI_NAMES clntsh libclntsh oci) - set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32) - set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12) + set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz19 libnnz19 ociw32) + set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12 libocci.so.19.1 oraocci19) set(ORACLE_LIB_DIR From df776c620e378d25e383142b3ef34d316d81ba9f Mon Sep 17 00:00:00 2001 From: Erusman Date: Fri, 3 Jul 2020 19:58:48 -0700 Subject: [PATCH 2/3] add Oracle 18.3 Instant Client to FindOracle.cmake --- cmake/linux/FindOracle.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/linux/FindOracle.cmake b/cmake/linux/FindOracle.cmake index de8a9737..f5c2215f 100644 --- a/cmake/linux/FindOracle.cmake +++ b/cmake/linux/FindOracle.cmake @@ -52,6 +52,12 @@ if(DEFINED ENV{ORACLE_HOME}) /usr/share/oracle/12.2/client64 /usr/lib/oracle/12.2/client /usr/share/oracle/12.2/client + /usr/include/oracle/18.3/client64 + /usr/include/oracle/18.3/client + /usr/lib/oracle/18.3/client64 + /usr/share/oracle/18.3/client64 + /usr/lib/oracle/18.3/client + /usr/share/oracle/18.3/client /usr/include/oracle/19.6/client64 /usr/include/oracle/19.6/client /usr/lib/oracle/19.6/client64 From 1f54f1956c6ea83c3b30de53e377e9d4454c0259 Mon Sep 17 00:00:00 2001 From: Erusman Date: Fri, 3 Jul 2020 20:12:41 -0700 Subject: [PATCH 3/3] part of last commit --- cmake/linux/FindOracle.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/linux/FindOracle.cmake b/cmake/linux/FindOracle.cmake index f5c2215f..b1468463 100644 --- a/cmake/linux/FindOracle.cmake +++ b/cmake/linux/FindOracle.cmake @@ -71,7 +71,7 @@ if(DEFINED ENV{ORACLE_HOME}) set(ORACLE_OCI_NAMES clntsh libclntsh oci) - set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz19 libnnz19 ociw32) + set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 nnz19 libnnz19 ociw32) set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12 libocci.so.19.1 oraocci19)