Skip to content

Commit

Permalink
Add InstanClient on Win paths to FindOracle.cmake
Browse files Browse the repository at this point in the history
Having InstanClient SDK unpacked in C:\instantclient_11_2, the lookup
seems to work:
-- ORACLE_INCLUDE_DIR = C:/instantclient_11_2/sdk/include
-- ORACLE_LIBRARIES       =
c:/instantclient_11_2/sdk/lib/msvc/ociw32.lib
C:/instantclient_11_2/sdk/lib/msvc/oraocci11.lib
C:/instantclient_11_2/sdk/lib/msvc/ociw32.lib
  • Loading branch information
mloskot committed Feb 22, 2013
1 parent eab346c commit cf56ee4
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/cmake/modules/FindOracle.cmake
Expand Up @@ -10,7 +10,7 @@
# but not for general use are
# ORACLE_VERSION = version of library which was found, e.g. "1.2.5"
#
# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
# Copyright (c) 2009-2013 Mateusz Loskot <mateusz@loskot.net>
#
# Developed with inspiration from Petr Vanek <petr@scribus.info>
# who wrote similar macro for TOra - http://torasql.com/
Expand All @@ -26,13 +26,14 @@
if(DEFINED ENV{ORACLE_HOME})

set(ORACLE_HOME $ENV{ORACLE_HOME})
message("ORACLE_HOME=${ORACLE_HOME}")

find_path(ORACLE_INCLUDE_DIR
oci.h
NAMES oci.h
PATHS
${ORACLE_HOME}/rdbms/public
${ORACLE_HOME}/include
${ORACLE_HOME}/sdk/include # Oracle SDK
${ORACLE_HOME}/sdk/include # Oracle SDK
${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

set(ORACLE_OCI_NAMES clntsh libclntsh oci)
Expand All @@ -41,7 +42,9 @@ if(DEFINED ENV{ORACLE_HOME})

set(ORACLE_LIB_DIR
${ORACLE_HOME}/lib
${ORACLE_HOME}/OCI/lib/MSVC) # Oracle XE on Windows
${ORACLE_HOME}/sdk/lib # Oracle SDK
${ORACLE_HOME}/sdk/lib/msvc
${ORACLE_HOME}/OCI/lib/msvc) # Oracle XE on Windows

find_library(ORACLE_OCI_LIBRARY NAMES ${ORACLE_OCI_NAMES} PATHS ${ORACLE_LIB_DIR})
find_library(ORACLE_OCCI_LIBRARY NAMES ${ORACLE_OCCI_NAMES} PATHS ${ORACLE_LIB_DIR})
Expand Down

0 comments on commit cf56ee4

Please sign in to comment.