diff --git a/cmake/linux/FindLibXml2.cmake b/cmake/linux/FindLibXml2.cmake index fce4c01a..916b1c20 100644 --- a/cmake/linux/FindLibXml2.cmake +++ b/cmake/linux/FindLibXml2.cmake @@ -1,7 +1,4 @@ -find_path(LIBXML2_ROOT - NAMES include/zlib.h -) find_path(LIBXML2_INCLUDE_DIR libxml/xpath.h HINTS diff --git a/cmake/linux/FindOracle.cmake b/cmake/linux/FindOracle.cmake index 30fec0ae..a4d14c4b 100644 --- a/cmake/linux/FindOracle.cmake +++ b/cmake/linux/FindOracle.cmake @@ -26,56 +26,12 @@ # If ORACLE_HOME not defined, assume Oracle libraries not available if(DEFINED ENV{ORACLE_HOME}) - set(ORACLE_HOME $ENV{ORACLE_HOME}) - message("ORACLE_HOME=${ORACLE_HOME}") - find_path(ORACLE_INCLUDE_DIR NAMES oci.h PATHS - /usr/include/oracle/12.1/client64 - /usr/include/oracle/12.1/client - /usr/lib/oracle/12.1/client64 - /usr/share/oracle/12.1/client64 - /usr/lib/oracle/12.1/client - /usr/share/oracle/12.1/client - /usr/include/oracle/10.2.0.4/client64 - /usr/include/oracle/10.2.0.4/client - /usr/lib/oracle/10.2.0.4/client64 - /usr/share/oracle/10.2.0.4/client64 - /usr/lib/oracle/10.2.0.4/client - /usr/share/oracle/10.2.0.4/client - /usr/include/oracle/12.2/client64 - /usr/include/oracle/12.2/client - /usr/lib/oracle/12.2/client64 - /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 - /usr/include/oracle/19.12/client64 - /usr/include/oracle/19.12/client - /usr/lib/oracle/19.12/client64 - /usr/share/oracle/19.12/client64 - /usr/lib/oracle/19.12/client - /usr/share/oracle/19.12/client - /usr/include/oracle/21/client - /usr/lib/oracle/21/client - /usr/share/oracle/21/client - /usr/include/oracle/21/client64 - /usr/lib/oracle/21/client64 - /usr/share/oracle/21/client64 ${ORACLE_HOME}/rdbms/public ${ORACLE_HOME}/include ${ORACLE_HOME}/sdk/include # Oracle SDK @@ -83,8 +39,8 @@ if(DEFINED ENV{ORACLE_HOME}) set(ORACLE_OCI_NAMES clntsh libclntsh oci) - set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 nnz19 libnnz19 nnz21 libnnz21 ociw32) - set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12 libocci.so.19.1 oraocci19) + set(ORACLE_NNZ_NAMES nnz18 libnnz18 ociw32) + set(ORACLE_OCCI_NAMES libocci occi) set(ORACLE_LIB_DIR diff --git a/cmake/linux/FindPCRE.cmake b/cmake/linux/FindPCRE.cmake index eb3c2da7..6129b0d4 100644 --- a/cmake/linux/FindPCRE.cmake +++ b/cmake/linux/FindPCRE.cmake @@ -1,8 +1,3 @@ - -find_path(PCRE_ROOT - NAMES include/pcre.h -) - find_path(PCRE_INCLUDE_DIR pcre.h HINTS $ENV{PCRE_ROOT}