swg-duality/src
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tekaoh
2020-07-05 18:02:47 +00:00
parent 586a35e085 1f54f1956c
commit e2ee1a17e1
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/linux/FindOracle.cmake
View File

@@ -52,6 +52,18 @@ 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
/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 +71,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 nnz18 libnnz18 nnz19 libnnz19 ociw32)
set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12 libocci.so.19.1 oraocci19)
set(ORACLE_LIB_DIR