From: <su...@us...> - 2008-07-17 12:51:57
|
Revision: 2896 http://tora.svn.sourceforge.net/tora/?rev=2896&view=rev Author: subik Date: 2008-07-17 12:51:36 +0000 (Thu, 17 Jul 2008) Log Message: ----------- enthanced search for oracle libs (win oraclexe) Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2008-07-16 03:56:23 UTC (rev 2895) +++ trunk/tora/cmake/modules/FindOracle.cmake 2008-07-17 12:51:36 UTC (rev 2896) @@ -17,13 +17,24 @@ IF (ORACLE_PATH_INCLUDES) SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) ELSE (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION ${ORACLE_HOME}/rdbms/public ${ORACLE_HOME}/include) + SET (ORACLE_INCLUDES_LOCATION + ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include + # sdk + ${ORACLE_HOME}/sdk/include + # xe on windows + ${ORACLE_HOME}/OCI/include + ) ENDIF (ORACLE_PATH_INCLUDES) IF (ORACLE_PATH_LIB) SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) ELSE (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION ${ORACLE_HOME}/lib) + SET (ORACLE_LIB_LOCATION + ${ORACLE_HOME}/lib + # xe on windows + ${ORACLE_HOME}/OCI/lib/MSVC + ) ENDIF (ORACLE_PATH_LIB) FIND_PATH( @@ -32,13 +43,6 @@ ${ORACLE_INCLUDES_LOCATION} ) -SET( - ORACLE_INCLUDES - ${ORACLE_INCLUDES} - ${ORACLE_HOME}/rdbms/public - ${ORACLE_HOME}/sdk/include -) - FIND_LIBRARY( ORACLE_LIBRARY_OCCI NAMES libocci occi oraocci10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-10-08 09:40:14
|
Revision: 3042 http://tora.svn.sourceforge.net/tora/?rev=3042&view=rev Author: m0m Date: 2008-10-08 09:37:30 +0000 (Wed, 08 Oct 2008) Log Message: ----------- added ORACLE_OCI_VERSION for 11g instantclient Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2008-10-01 13:33:23 UTC (rev 3041) +++ trunk/tora/cmake/modules/FindOracle.cmake 2008-10-08 09:37:30 UTC (rev 3042) @@ -55,7 +55,7 @@ ) FIND_LIBRARY( ORACLE_LIBRARY_LNNZ - NAMES libnnz10 nnz10 ociw32 + NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 PATHS ${ORACLE_LIB_LOCATION} ) @@ -87,6 +87,8 @@ SET(ORACLE_OCI_VERSION "10G_R2") ELSEIF (${sqlplus_out} MATCHES "10.*") SET(ORACLE_OCI_VERSION "10G") + ELSEIF (${sqlplus_out} MATCHES "11.*") + SET(ORACLE_OCI_VERSION "11G") ELSE (${sqlplus_out} MATCHES "8.*") SET(ORACLE_OCI_VERSION "10G_R2") ENDIF (${sqlplus_out} MATCHES "8.*") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2009-04-29 08:18:05
|
Revision: 3176 http://tora.svn.sourceforge.net/tora/?rev=3176&view=rev Author: subik Date: 2009-04-29 08:18:02 +0000 (Wed, 29 Apr 2009) Log Message: ----------- Possible fix for #2533451 Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2009-04-26 13:30:27 UTC (rev 3175) +++ trunk/tora/cmake/modules/FindOracle.cmake 2009-04-29 08:18:02 UTC (rev 3176) @@ -53,18 +53,18 @@ NAMES libclntsh clntsh oci PATHS ${ORACLE_LIB_LOCATION} ) -FIND_LIBRARY( - ORACLE_LIBRARY_LNNZ - NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 - PATHS ${ORACLE_LIB_LOCATION} -) +#FIND_LIBRARY( +# ORACLE_LIBRARY_LNNZ +# NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 +# PATHS ${ORACLE_LIB_LOCATION} +#) SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_LNNZ}) -IF (ORACLE_LIBRARY) +IF (ORACLE_LIBRARY AND ORACLE_INCLUDES) SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_LIBRARY) +ENDIF (ORACLE_LIBRARY AND ORACLE_INCLUDES) # guess OCI version This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2009-09-23 09:12:07
|
Revision: 3308 http://tora.svn.sourceforge.net/tora/?rev=3308&view=rev Author: subik Date: 2009-09-23 09:11:49 +0000 (Wed, 23 Sep 2009) Log Message: ----------- ora11 libs on windows Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2009-09-22 14:38:31 UTC (rev 3307) +++ trunk/tora/cmake/modules/FindOracle.cmake 2009-09-23 09:11:49 UTC (rev 3308) @@ -45,7 +45,7 @@ FIND_LIBRARY( ORACLE_LIBRARY_OCCI - NAMES libocci occi oraocci10 + NAMES libocci occi oraocci10 oraocci11 PATHS ${ORACLE_LIB_LOCATION} ) FIND_LIBRARY( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-02-14 14:19:36
|
Revision: 3421 http://tora.svn.sourceforge.net/tora/?rev=3421&view=rev Author: ibre5041 Date: 2010-02-14 14:19:30 +0000 (Sun, 14 Feb 2010) Log Message: ----------- detection of Oracle XDK added Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2010-02-14 14:15:38 UTC (rev 3420) +++ trunk/tora/cmake/modules/FindOracle.cmake 2010-02-14 14:19:30 UTC (rev 3421) @@ -1,6 +1,7 @@ # TOra: Configure Oracle libraries # # ORACLE_FOUND - system has Oracle OCI +# ORACLE_HAS_XML - Oracle has XDK support(thick client installed) # ORACLE_INCLUDES - where to find oci.h # ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI # @@ -9,17 +10,18 @@ # SET(ORACLE_FOUND "NO") +SET(ORACLE_HAS_XML "NO") +SET(ORACLE_HOME $ENV{ORACLE_HOME}) -set(ORACLE_HOME $ENV{ORACLE_HOME}) - - IF (ORACLE_PATH_INCLUDES) SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) ELSE (ORACLE_PATH_INCLUDES) SET (ORACLE_INCLUDES_LOCATION ${ORACLE_HOME}/rdbms/public ${ORACLE_HOME}/include + # xdk + ${ORACLE_HOME}/xdk/include # sdk ${ORACLE_HOME}/sdk/include # xe on windows @@ -31,9 +33,11 @@ SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) ELSE (ORACLE_PATH_LIB) SET (ORACLE_LIB_LOCATION + # TODO add 32/64bit version here (lib32/lib64 on some platforms) ${ORACLE_HOME}/lib # xe on windows ${ORACLE_HOME}/OCI/lib/MSVC + ${ORACLE_HOME} ) ENDIF (ORACLE_PATH_LIB) @@ -41,26 +45,32 @@ ORACLE_INCLUDES oci.h ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) +FIND_PATH( + ORACLE_INCLUDES_XML + xml.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + FIND_LIBRARY( - ORACLE_LIBRARY_OCCI - NAMES libocci occi oraocci10 oraocci11 - PATHS ${ORACLE_LIB_LOCATION} -) -FIND_LIBRARY( ORACLE_LIBRARY_CLNTSH NAMES libclntsh clntsh oci PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) -#FIND_LIBRARY( -# ORACLE_LIBRARY_LNNZ -# NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 -# PATHS ${ORACLE_LIB_LOCATION} -#) -SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_LNNZ}) +FIND_LIBRARY( + ORACLE_LIBRARY_XML + NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) +SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) + IF (APPLE) FIND_LIBRARY(ORACLE_LIBRARY_OCIEI NAMES libociei ociei @@ -68,19 +78,26 @@ ) MESSAGE(STATUS "Searching for libociei: ${ORACLE_LIBRARY_OCIEI} in ${ORACLE_LIB_LOCATION}") IF (ORACLE_LIBRARY_OCIEI) - SET (ORACLE_LIBRARY ${ORACLE_LIBRARY} ${ORACLE_LIBRARY_OCIEI}) + LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_OCIEI}) ELSE (ORACLE_LIBRARY_OCIEI) MESSAGE(STATUS "libociei.dylib is not found. Maybe it will cause crashes if you are building BUNDLE") ENDIF (ORACLE_LIBRARY_OCIEI) ENDIF (APPLE) +IF (ORACLE_LIBRARY_XML) + LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML}) +ENDIF (ORACLE_LIBRARY_XML) - -IF (ORACLE_LIBRARY AND ORACLE_INCLUDES) +IF (ORACLE_INCLUDES AND ORACLE_LIBRARY) SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_LIBRARY AND ORACLE_INCLUDES) +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARY) +IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + ADD_DEFINITIONS(-DORACLE_HAS_XML) + SET(ORACLE_HAS_XML "YES") + LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) +ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) # guess OCI version IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) @@ -113,10 +130,12 @@ MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) - +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") IF (ORACLE_FOUND) IF (NOT ORACLE_FIND_QUIETLY) MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") + MESSAGE(STATUS " ${ORACLE_INCLUDES}") ENDIF (NOT ORACLE_FIND_QUIETLY) # there *must* be OCI version defined for internal libraries IF (ORACLE_OCI_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-02-25 14:59:11
|
Revision: 3445 http://tora.svn.sourceforge.net/tora/?rev=3445&view=rev Author: ibre5041 Date: 2010-02-25 14:59:05 +0000 (Thu, 25 Feb 2010) Log Message: ----------- Oracle OCI version -DORACLE_OCI_VERSION is not used anymore Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2010-02-25 14:38:57 UTC (rev 3444) +++ trunk/tora/cmake/modules/FindOracle.cmake 2010-02-25 14:59:05 UTC (rev 3445) @@ -138,11 +138,11 @@ MESSAGE(STATUS " ${ORACLE_INCLUDES}") ENDIF (NOT ORACLE_FIND_QUIETLY) # there *must* be OCI version defined for internal libraries - IF (ORACLE_OCI_VERSION) - ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - ELSE (ORACLE_OCI_VERSION) - MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - ENDIF (ORACLE_OCI_VERSION) + #IF (ORACLE_OCI_VERSION) + # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + #ELSE (ORACLE_OCI_VERSION) + # MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + #ENDIF (ORACLE_OCI_VERSION) ELSE (ORACLE_FOUND) MESSAGE(STATUS "Oracle not found.") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-02-25 16:44:06
|
Revision: 3446 http://tora.svn.sourceforge.net/tora/?rev=3446&view=rev Author: ibre5041 Date: 2010-02-25 16:43:59 +0000 (Thu, 25 Feb 2010) Log Message: ----------- okay we need oracle client version for otl Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2010-02-25 14:59:05 UTC (rev 3445) +++ trunk/tora/cmake/modules/FindOracle.cmake 2010-02-25 16:43:59 UTC (rev 3446) @@ -138,11 +138,11 @@ MESSAGE(STATUS " ${ORACLE_INCLUDES}") ENDIF (NOT ORACLE_FIND_QUIETLY) # there *must* be OCI version defined for internal libraries - #IF (ORACLE_OCI_VERSION) - # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - #ELSE (ORACLE_OCI_VERSION) - # MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - #ENDIF (ORACLE_OCI_VERSION) + IF (ORACLE_OCI_VERSION) + ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + ELSE (ORACLE_OCI_VERSION) + MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2 11G]") + ENDIF (ORACLE_OCI_VERSION) ELSE (ORACLE_FOUND) MESSAGE(STATUS "Oracle not found.") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2010-05-23 07:40:00
|
Revision: 3538 http://tora.svn.sourceforge.net/tora/?rev=3538&view=rev Author: subik Date: 2010-05-23 07:39:54 +0000 (Sun, 23 May 2010) Log Message: ----------- find oracle: fix for undefined lib variables Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2010-05-21 21:24:51 UTC (rev 3537) +++ trunk/tora/cmake/modules/FindOracle.cmake 2010-05-23 07:39:54 UTC (rev 3538) @@ -74,6 +74,8 @@ SET(FORCE_ERROR 0) + +set(ORACLE_LIBRARY_CLNTSH "") IF (ORACLE_USE_CLNTSH) FIND_LIBRARY( ORACLE_LIBRARY_CLNTSH @@ -87,6 +89,7 @@ ENDIF (ORACLE_USE_CLNTSH) +set (ORACLE_LIBRARY_OCCI "") IF (ORACLE_USE_OCCI) FIND_LIBRARY( ORACLE_LIBRARY_OCCI @@ -99,6 +102,8 @@ ENDIF (NOT ORACLE_LIBRARY_OCCI AND Oracle_FIND_REQUIRED) ENDIF (ORACLE_USE_OCCI) + +set (ORACLE_LIBRARY_XML "") IF (ORACLE_USE_XML) FIND_PATH( ORACLE_INCLUDES_XML @@ -106,9 +111,12 @@ ${ORACLE_INCLUDES_LOCATION} NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) - IF (NOT ORACLE_INCLUDES_XML AND Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "XML") - ENDIF (NOT ORACLE_INCLUDES_XML AND Oracle_FIND_REQUIRED) + IF (NOT ORACLE_INCLUDES_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_INCLUDES_XML "") + ENDIF (NOT ORACLE_INCLUDES_XML) FIND_LIBRARY( ORACLE_LIBRARY_XML @@ -121,6 +129,8 @@ ENDIF (NOT ORACLE_LIBRARY_XML AND Oracle_FIND_REQUIRED) ENDIF (ORACLE_USE_XML) + +set (ORACLE_LIBRARY_OCIEI "") IF (ORACLE_USE_OCIEI) FIND_LIBRARY(ORACLE_LIBRARY_OCIEI NAMES libociei ociei This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2010-05-26 06:25:04
|
Revision: 3545 http://tora.svn.sourceforge.net/tora/?rev=3545&view=rev Author: subik Date: 2010-05-26 06:24:57 +0000 (Wed, 26 May 2010) Log Message: ----------- findoracle fixe for more platforms Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2010-05-24 20:44:52 UTC (rev 3544) +++ trunk/tora/cmake/modules/FindOracle.cmake 2010-05-26 06:24:57 UTC (rev 3545) @@ -75,21 +75,23 @@ SET(FORCE_ERROR 0) -set(ORACLE_LIBRARY_CLNTSH "") IF (ORACLE_USE_CLNTSH) FIND_LIBRARY( ORACLE_LIBRARY_CLNTSH NAMES libclntsh clntsh oci PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + # NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) - IF (NOT ORACLE_LIBRARY_CLNTSH AND Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "CLNTSH") - ENDIF (NOT ORACLE_LIBRARY_CLNTSH AND Oracle_FIND_REQUIRED) + IF (NOT ORACLE_LIBRARY_CLNTSH) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "CLNTSH") + ENDIF (Oracle_FIND_REQUIRED) + set(ORACLE_LIBRARY_CLNTSH "") + ENDIF (NOT ORACLE_LIBRARY_CLNTSH) ENDIF (ORACLE_USE_CLNTSH) -set (ORACLE_LIBRARY_OCCI "") +#set (ORACLE_LIBRARY_OCCI "") IF (ORACLE_USE_OCCI) FIND_LIBRARY( ORACLE_LIBRARY_OCCI @@ -97,13 +99,15 @@ PATHS ${ORACLE_LIB_LOCATION} NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) - IF (NOT ORACLE_LIBRARY_OCCI AND Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "OCCI") - ENDIF (NOT ORACLE_LIBRARY_OCCI AND Oracle_FIND_REQUIRED) + IF (NOT ORACLE_LIBRARY_OCCI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCCI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCCI "") + ENDIF (NOT ORACLE_LIBRARY_OCCI) ENDIF (ORACLE_USE_OCCI) -set (ORACLE_LIBRARY_XML "") IF (ORACLE_USE_XML) FIND_PATH( ORACLE_INCLUDES_XML @@ -124,33 +128,40 @@ PATHS ${ORACLE_LIB_LOCATION} NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) - IF (NOT ORACLE_LIBRARY_XML AND Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "XML") - ENDIF (NOT ORACLE_LIBRARY_XML AND Oracle_FIND_REQUIRED) + IF (NOT ORACLE_LIBRARY_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + endif (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_XML "") + ENDIF (NOT ORACLE_LIBRARY_XML) ENDIF (ORACLE_USE_XML) - -set (ORACLE_LIBRARY_OCIEI "") IF (ORACLE_USE_OCIEI) FIND_LIBRARY(ORACLE_LIBRARY_OCIEI NAMES libociei ociei PATHS ${ORACLE_LIB_LOCATION} NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) - IF (NOT ORACLE_LIBRARY_OCIEI AND Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "OCIEI") - ENDIF (NOT ORACLE_LIBRARY_OCIEI AND Oracle_FIND_REQUIRED) + IF (NOT ORACLE_LIBRARY_OCIEI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCIEI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCIEI "") + ENDIF (NOT ORACLE_LIBRARY_OCIEI) ENDIF (ORACLE_USE_OCIEI) IF (NOT FORCE_ERROR) - SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI}) + SET (ORACLE_LIBRARIES ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI}) ENDIF (NOT FORCE_ERROR) +MESSAGE(STATUS "ORACLE_LIBRARY_CLNTSH ${ORACLE_LIBRARY_CLNTSH}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCCI ${ORACLE_LIBRARY_OCCI}") +MESSAGE(STATUS "ORACLE_LIBRARY_XML ${ORACLE_LIBRARY_XML}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCIEI ${ORACLE_LIBRARY_OCIEI}") -IF (ORACLE_INCLUDES AND ORACLE_LIBRARY) - SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) +IF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARY) +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) ADD_DEFINITIONS(-DORACLE_HAS_XML) @@ -185,7 +196,7 @@ MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}") ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) -MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARIES} (ORACLE_HOME='${ORACLE_HOME}')") MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}") MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") @@ -203,7 +214,7 @@ MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") - MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARIES}") IF (FORCE_ERROR) MESSAGE(STATUS "Failed module info: ${FORCE_ERROR}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2011-07-04 12:03:16
|
Revision: 3993 http://tora.svn.sourceforge.net/tora/?rev=3993&view=rev Author: ibre5041 Date: 2011-07-04 12:03:10 +0000 (Mon, 04 Jul 2011) Log Message: ----------- Fix build on WinXP with InstantClient Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2011-07-01 23:56:10 UTC (rev 3992) +++ trunk/tora/cmake/modules/FindOracle.cmake 2011-07-04 12:03:10 UTC (rev 3993) @@ -1,231 +1,231 @@ -# TOra: Configure Oracle libraries -# -# ORACLE_FOUND - system has Oracle OCI -# ORACLE_HAS_XML - Oracle has XDK support(thick client installed) -# ORACLE_INCLUDES - where to find oci.h -# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI -# -# Components: CLNTSH, OCCI, XML, OCIEI -# CLNTSH is enabled by default -# for example: FIND_PACKAGE(Oracle REQUIRED CLNTSH OCCI) -# -# copyright (c) 2007 Petr Vanek <pe...@sc...> -# copyright (c) 2009 Ivan Brezina <ibr...@ib...> -# Redistribution and use is allowed according to the terms of the GPLv2 license. -# - -SET(ORACLE_FOUND "NO") -SET(ORACLE_HAS_XML "NO") -SET(ORACLE_HOME $ENV{ORACLE_HOME}) - -# "components" handling. It enables to find various independent libraries, -IF( Oracle_FIND_COMPONENTS ) - FOREACH( component ${Oracle_FIND_COMPONENTS} ) - STRING( TOUPPER ${component} _COMPONENT ) - SET( ORACLE_USE_${_COMPONENT} 1 ) - ENDFOREACH( component ) - - # legacy behaviour - IF (NOT ORACLE_USE_CLNTSH) - SET(ORACLE_USE_CLNTSH 1) - ENDIF (NOT ORACLE_USE_CLNTSH) - - # it looks like it's mandatory on macosx - IF (APPLE) - SET(ORACLE_USE_OCIEI 1) - ENDIF (APPLE) - -ENDIF( Oracle_FIND_COMPONENTS ) - - -IF (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) -ELSE (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION - ${ORACLE_HOME}/rdbms/public - ${ORACLE_HOME}/include - # xdk - ${ORACLE_HOME}/xdk/include - # sdk - ${ORACLE_HOME}/sdk/include - # xe on windows - ${ORACLE_HOME}/OCI/include - # InstantClient on WinXP - ${ORACLE_HOME}/sdk/lib/msvc/ - ) -ENDIF (ORACLE_PATH_INCLUDES) - -IF (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) -ELSE (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION - # TODO add 32/64bit version here (lib32/lib64 on some platforms) - ${ORACLE_HOME}/lib - # xe on windows - ${ORACLE_HOME}/OCI/lib/MSVC - ${ORACLE_HOME} - ) -ENDIF (ORACLE_PATH_LIB) - -FIND_PATH( - ORACLE_INCLUDES - oci.h - ${ORACLE_INCLUDES_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) - -SET(FORCE_ERROR 0) - - -IF (ORACLE_USE_CLNTSH) - FIND_LIBRARY( - ORACLE_LIBRARY_CLNTSH - NAMES libclntsh clntsh oci - PATHS ${ORACLE_LIB_LOCATION} - # NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_CLNTSH) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "CLNTSH") - ENDIF (Oracle_FIND_REQUIRED) - set(ORACLE_LIBRARY_CLNTSH "") - ENDIF (NOT ORACLE_LIBRARY_CLNTSH) -ENDIF (ORACLE_USE_CLNTSH) - - -#set (ORACLE_LIBRARY_OCCI "") -IF (ORACLE_USE_OCCI) - FIND_LIBRARY( - ORACLE_LIBRARY_OCCI - NAMES libocci occi - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_OCCI) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "OCCI") - ENDIF (Oracle_FIND_REQUIRED) - set (ORACLE_LIBRARY_OCCI "") - ENDIF (NOT ORACLE_LIBRARY_OCCI) -ENDIF (ORACLE_USE_OCCI) - - -IF (ORACLE_USE_XML) - FIND_PATH( - ORACLE_INCLUDES_XML - xml.h - ${ORACLE_INCLUDES_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_INCLUDES_XML) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "XML") - ENDIF (Oracle_FIND_REQUIRED) - set (ORACLE_INCLUDES_XML "") - ENDIF (NOT ORACLE_INCLUDES_XML) - - FIND_LIBRARY( - ORACLE_LIBRARY_XML - NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_XML) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "XML") - endif (Oracle_FIND_REQUIRED) - set (ORACLE_LIBRARY_XML "") - ENDIF (NOT ORACLE_LIBRARY_XML) -ENDIF (ORACLE_USE_XML) - -IF (ORACLE_USE_OCIEI) - FIND_LIBRARY(ORACLE_LIBRARY_OCIEI - NAMES libociei ociei - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_OCIEI) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "OCIEI") - ENDIF (Oracle_FIND_REQUIRED) - set (ORACLE_LIBRARY_OCIEI "") - ENDIF (NOT ORACLE_LIBRARY_OCIEI) -ENDIF (ORACLE_USE_OCIEI) - -IF (NOT FORCE_ERROR) - SET (ORACLE_LIBRARIES ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI}) -ENDIF (NOT FORCE_ERROR) -MESSAGE(STATUS "ORACLE_LIBRARY_CLNTSH ${ORACLE_LIBRARY_CLNTSH}") -MESSAGE(STATUS "ORACLE_LIBRARY_OCCI ${ORACLE_LIBRARY_OCCI}") -MESSAGE(STATUS "ORACLE_LIBRARY_XML ${ORACLE_LIBRARY_XML}") -MESSAGE(STATUS "ORACLE_LIBRARY_OCIEI ${ORACLE_LIBRARY_OCIEI}") - - -IF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) - SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) - -IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) - ADD_DEFINITIONS(-DORACLE_HAS_XML) - SET(ORACLE_HAS_XML "YES") - LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) -ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) - -# guess OCI version -IF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) - TRY_RUN(OCIVER_TYPE OCIVER_COMPILED - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/cmake/modules/OCIVersion.c - CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}" - OUTPUT_VARIABLE OCIVER) - - IF (${OCIVER_TYPE} GREATER "110") - SET(ORACLE_OCI_VERSION "11G") - ELSEIF (${OCIVER_TYPE} EQUAL "102") - SET(ORACLE_OCI_VERSION "10G_R2") - ELSEIF (${OCIVER_TYPE} EQUAL "101") - SET(ORACLE_OCI_VERSION "10G") - ELSEIF (${OCIVER_TYPE} EQUAL "91") - SET(ORACLE_OCI_VERSION "9") - ELSEIF (${OCIVER_TYPE} EQUAL "92") - SET(ORACLE_OCI_VERSION "9") - ELSEIF (NOT ${OCIVER_TYPE} GREATER "90") - SET(ORACLE_OCI_VERSION "8I") - ELSE (${OCIVER_TYPE} GREATER "110") - SET(ORACLE_OCI_VERSION "10G_R2") - ENDIF (${OCIVER_TYPE} GREATER "110") - - MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}") -ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) - -MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARIES} (ORACLE_HOME='${ORACLE_HOME}')") -MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}") -MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") - -IF (ORACLE_FOUND) - # there *must* be OCI version defined for internal libraries - IF (ORACLE_OCI_VERSION) - ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - ELSE (ORACLE_OCI_VERSION) - MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - ENDIF (ORACLE_OCI_VERSION) - -ELSE (ORACLE_FOUND) - - MESSAGE(STATUS "Oracle not found.") - MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") - MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") - MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") - MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARIES}") - - IF (FORCE_ERROR) - MESSAGE(STATUS "Failed module info: ${FORCE_ERROR}") - ENDIF (FORCE_ERROR) - IF (Oracle_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Oracle library") - ELSE (Oracle_FIND_REQUIRED) - # setup the variables for silent continue - SET (ORACLE_INCLUDES "") - ENDIF (Oracle_FIND_REQUIRED) - -ENDIF (ORACLE_FOUND) +# TOra: Configure Oracle libraries +# +# ORACLE_FOUND - system has Oracle OCI +# ORACLE_HAS_XML - Oracle has XDK support(thick client installed) +# ORACLE_INCLUDES - where to find oci.h +# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI +# +# Components: CLNTSH, OCCI, XML, OCIEI +# CLNTSH is enabled by default +# for example: FIND_PACKAGE(Oracle REQUIRED CLNTSH OCCI) +# +# copyright (c) 2007 Petr Vanek <pe...@sc...> +# copyright (c) 2009 Ivan Brezina <ibr...@ib...> +# Redistribution and use is allowed according to the terms of the GPLv2 license. +# + +SET(ORACLE_FOUND "NO") +SET(ORACLE_HAS_XML "NO") +SET(ORACLE_HOME $ENV{ORACLE_HOME}) + +# "components" handling. It enables to find various independent libraries, +IF( Oracle_FIND_COMPONENTS ) + FOREACH( component ${Oracle_FIND_COMPONENTS} ) + STRING( TOUPPER ${component} _COMPONENT ) + SET( ORACLE_USE_${_COMPONENT} 1 ) + ENDFOREACH( component ) + + # legacy behaviour + IF (NOT ORACLE_USE_CLNTSH) + SET(ORACLE_USE_CLNTSH 1) + ENDIF (NOT ORACLE_USE_CLNTSH) + + # it looks like it's mandatory on macosx + IF (APPLE) + SET(ORACLE_USE_OCIEI 1) + ENDIF (APPLE) + +ENDIF( Oracle_FIND_COMPONENTS ) + + +IF (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) +ELSE (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION + ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include + # xdk + ${ORACLE_HOME}/xdk/include + # sdk + ${ORACLE_HOME}/sdk/include + # xe on windows + ${ORACLE_HOME}/OCI/include + ) +ENDIF (ORACLE_PATH_INCLUDES) + +IF (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) +ELSE (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION + # TODO add 32/64bit version here (lib32/lib64 on some platforms) + ${ORACLE_HOME}/lib + # xe on windows + ${ORACLE_HOME}/OCI/lib/MSVC + ${ORACLE_HOME} + # InstantClient on WinXP + ${ORACLE_HOME}/sdk/lib/msvc/ + ) +ENDIF (ORACLE_PATH_LIB) + +FIND_PATH( + ORACLE_INCLUDES + oci.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +SET(FORCE_ERROR 0) + + +IF (ORACLE_USE_CLNTSH) + FIND_LIBRARY( + ORACLE_LIBRARY_CLNTSH + NAMES libclntsh clntsh oci + PATHS ${ORACLE_LIB_LOCATION} + # NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_CLNTSH) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "CLNTSH") + ENDIF (Oracle_FIND_REQUIRED) + set(ORACLE_LIBRARY_CLNTSH "") + ENDIF (NOT ORACLE_LIBRARY_CLNTSH) +ENDIF (ORACLE_USE_CLNTSH) + + +#set (ORACLE_LIBRARY_OCCI "") +IF (ORACLE_USE_OCCI) + FIND_LIBRARY( + ORACLE_LIBRARY_OCCI + NAMES libocci occi + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_OCCI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCCI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCCI "") + ENDIF (NOT ORACLE_LIBRARY_OCCI) +ENDIF (ORACLE_USE_OCCI) + + +IF (ORACLE_USE_XML) + FIND_PATH( + ORACLE_INCLUDES_XML + xml.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_INCLUDES_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_INCLUDES_XML "") + ENDIF (NOT ORACLE_INCLUDES_XML) + + FIND_LIBRARY( + ORACLE_LIBRARY_XML + NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + endif (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_XML "") + ENDIF (NOT ORACLE_LIBRARY_XML) +ENDIF (ORACLE_USE_XML) + +IF (ORACLE_USE_OCIEI) + FIND_LIBRARY(ORACLE_LIBRARY_OCIEI + NAMES libociei ociei + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_OCIEI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCIEI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCIEI "") + ENDIF (NOT ORACLE_LIBRARY_OCIEI) +ENDIF (ORACLE_USE_OCIEI) + +IF (NOT FORCE_ERROR) + SET (ORACLE_LIBRARIES ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI}) +ENDIF (NOT FORCE_ERROR) +MESSAGE(STATUS "ORACLE_LIBRARY_CLNTSH ${ORACLE_LIBRARY_CLNTSH}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCCI ${ORACLE_LIBRARY_OCCI}") +MESSAGE(STATUS "ORACLE_LIBRARY_XML ${ORACLE_LIBRARY_XML}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCIEI ${ORACLE_LIBRARY_OCIEI}") + + +IF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) + SET(ORACLE_FOUND "YES") +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) + +IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + ADD_DEFINITIONS(-DORACLE_HAS_XML) + SET(ORACLE_HAS_XML "YES") + LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) +ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + +# guess OCI version +IF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) + TRY_RUN(OCIVER_TYPE OCIVER_COMPILED + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/cmake/modules/OCIVersion.c + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}" + OUTPUT_VARIABLE OCIVER) + + IF (${OCIVER_TYPE} GREATER "110") + SET(ORACLE_OCI_VERSION "11G") + ELSEIF (${OCIVER_TYPE} EQUAL "102") + SET(ORACLE_OCI_VERSION "10G_R2") + ELSEIF (${OCIVER_TYPE} EQUAL "101") + SET(ORACLE_OCI_VERSION "10G") + ELSEIF (${OCIVER_TYPE} EQUAL "91") + SET(ORACLE_OCI_VERSION "9") + ELSEIF (${OCIVER_TYPE} EQUAL "92") + SET(ORACLE_OCI_VERSION "9") + ELSEIF (NOT ${OCIVER_TYPE} GREATER "90") + SET(ORACLE_OCI_VERSION "8I") + ELSE (${OCIVER_TYPE} GREATER "110") + SET(ORACLE_OCI_VERSION "10G_R2") + ENDIF (${OCIVER_TYPE} GREATER "110") + + MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}") +ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) + +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARIES} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}") +MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") + +IF (ORACLE_FOUND) + # there *must* be OCI version defined for internal libraries + IF (ORACLE_OCI_VERSION) + ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + ELSE (ORACLE_OCI_VERSION) + MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + ENDIF (ORACLE_OCI_VERSION) + +ELSE (ORACLE_FOUND) + + MESSAGE(STATUS "Oracle not found.") + MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") + MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") + MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARIES}") + + IF (FORCE_ERROR) + MESSAGE(STATUS "Failed module info: ${FORCE_ERROR}") + ENDIF (FORCE_ERROR) + IF (Oracle_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Oracle library") + ELSE (Oracle_FIND_REQUIRED) + # setup the variables for silent continue + SET (ORACLE_INCLUDES "") + ENDIF (Oracle_FIND_REQUIRED) + +ENDIF (ORACLE_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2011-07-04 12:49:40
|
Revision: 3994 http://tora.svn.sourceforge.net/tora/?rev=3994&view=rev Author: ibre5041 Date: 2011-07-04 12:49:33 +0000 (Mon, 04 Jul 2011) Log Message: ----------- Fix build on WinXP with InstantClient. Once again, this time having Unix line endings Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2011-07-04 12:03:10 UTC (rev 3993) +++ trunk/tora/cmake/modules/FindOracle.cmake 2011-07-04 12:49:33 UTC (rev 3994) @@ -1,231 +1,231 @@ -# TOra: Configure Oracle libraries -# -# ORACLE_FOUND - system has Oracle OCI -# ORACLE_HAS_XML - Oracle has XDK support(thick client installed) -# ORACLE_INCLUDES - where to find oci.h -# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI -# -# Components: CLNTSH, OCCI, XML, OCIEI -# CLNTSH is enabled by default -# for example: FIND_PACKAGE(Oracle REQUIRED CLNTSH OCCI) -# -# copyright (c) 2007 Petr Vanek <pe...@sc...> -# copyright (c) 2009 Ivan Brezina <ibr...@ib...> -# Redistribution and use is allowed according to the terms of the GPLv2 license. -# - -SET(ORACLE_FOUND "NO") -SET(ORACLE_HAS_XML "NO") -SET(ORACLE_HOME $ENV{ORACLE_HOME}) - -# "components" handling. It enables to find various independent libraries, -IF( Oracle_FIND_COMPONENTS ) - FOREACH( component ${Oracle_FIND_COMPONENTS} ) - STRING( TOUPPER ${component} _COMPONENT ) - SET( ORACLE_USE_${_COMPONENT} 1 ) - ENDFOREACH( component ) - - # legacy behaviour - IF (NOT ORACLE_USE_CLNTSH) - SET(ORACLE_USE_CLNTSH 1) - ENDIF (NOT ORACLE_USE_CLNTSH) - - # it looks like it's mandatory on macosx - IF (APPLE) - SET(ORACLE_USE_OCIEI 1) - ENDIF (APPLE) - -ENDIF( Oracle_FIND_COMPONENTS ) - - -IF (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) -ELSE (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION - ${ORACLE_HOME}/rdbms/public - ${ORACLE_HOME}/include - # xdk - ${ORACLE_HOME}/xdk/include - # sdk - ${ORACLE_HOME}/sdk/include - # xe on windows - ${ORACLE_HOME}/OCI/include - ) -ENDIF (ORACLE_PATH_INCLUDES) - -IF (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) -ELSE (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION - # TODO add 32/64bit version here (lib32/lib64 on some platforms) - ${ORACLE_HOME}/lib - # xe on windows - ${ORACLE_HOME}/OCI/lib/MSVC - ${ORACLE_HOME} - # InstantClient on WinXP - ${ORACLE_HOME}/sdk/lib/msvc/ - ) -ENDIF (ORACLE_PATH_LIB) - -FIND_PATH( - ORACLE_INCLUDES - oci.h - ${ORACLE_INCLUDES_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) - -SET(FORCE_ERROR 0) - - -IF (ORACLE_USE_CLNTSH) - FIND_LIBRARY( - ORACLE_LIBRARY_CLNTSH - NAMES libclntsh clntsh oci - PATHS ${ORACLE_LIB_LOCATION} - # NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_CLNTSH) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "CLNTSH") - ENDIF (Oracle_FIND_REQUIRED) - set(ORACLE_LIBRARY_CLNTSH "") - ENDIF (NOT ORACLE_LIBRARY_CLNTSH) -ENDIF (ORACLE_USE_CLNTSH) - - -#set (ORACLE_LIBRARY_OCCI "") -IF (ORACLE_USE_OCCI) - FIND_LIBRARY( - ORACLE_LIBRARY_OCCI - NAMES libocci occi - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_OCCI) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "OCCI") - ENDIF (Oracle_FIND_REQUIRED) - set (ORACLE_LIBRARY_OCCI "") - ENDIF (NOT ORACLE_LIBRARY_OCCI) -ENDIF (ORACLE_USE_OCCI) - - -IF (ORACLE_USE_XML) - FIND_PATH( - ORACLE_INCLUDES_XML - xml.h - ${ORACLE_INCLUDES_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_INCLUDES_XML) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "XML") - ENDIF (Oracle_FIND_REQUIRED) - set (ORACLE_INCLUDES_XML "") - ENDIF (NOT ORACLE_INCLUDES_XML) - - FIND_LIBRARY( - ORACLE_LIBRARY_XML - NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_XML) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "XML") - endif (Oracle_FIND_REQUIRED) - set (ORACLE_LIBRARY_XML "") - ENDIF (NOT ORACLE_LIBRARY_XML) -ENDIF (ORACLE_USE_XML) - -IF (ORACLE_USE_OCIEI) - FIND_LIBRARY(ORACLE_LIBRARY_OCIEI - NAMES libociei ociei - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH - ) - IF (NOT ORACLE_LIBRARY_OCIEI) - IF (Oracle_FIND_REQUIRED) - SET(FORCE_ERROR "OCIEI") - ENDIF (Oracle_FIND_REQUIRED) - set (ORACLE_LIBRARY_OCIEI "") - ENDIF (NOT ORACLE_LIBRARY_OCIEI) -ENDIF (ORACLE_USE_OCIEI) - -IF (NOT FORCE_ERROR) - SET (ORACLE_LIBRARIES ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI}) -ENDIF (NOT FORCE_ERROR) -MESSAGE(STATUS "ORACLE_LIBRARY_CLNTSH ${ORACLE_LIBRARY_CLNTSH}") -MESSAGE(STATUS "ORACLE_LIBRARY_OCCI ${ORACLE_LIBRARY_OCCI}") -MESSAGE(STATUS "ORACLE_LIBRARY_XML ${ORACLE_LIBRARY_XML}") -MESSAGE(STATUS "ORACLE_LIBRARY_OCIEI ${ORACLE_LIBRARY_OCIEI}") - - -IF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) - SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) - -IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) - ADD_DEFINITIONS(-DORACLE_HAS_XML) - SET(ORACLE_HAS_XML "YES") - LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) -ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) - -# guess OCI version -IF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) - TRY_RUN(OCIVER_TYPE OCIVER_COMPILED - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/cmake/modules/OCIVersion.c - CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}" - OUTPUT_VARIABLE OCIVER) - - IF (${OCIVER_TYPE} GREATER "110") - SET(ORACLE_OCI_VERSION "11G") - ELSEIF (${OCIVER_TYPE} EQUAL "102") - SET(ORACLE_OCI_VERSION "10G_R2") - ELSEIF (${OCIVER_TYPE} EQUAL "101") - SET(ORACLE_OCI_VERSION "10G") - ELSEIF (${OCIVER_TYPE} EQUAL "91") - SET(ORACLE_OCI_VERSION "9") - ELSEIF (${OCIVER_TYPE} EQUAL "92") - SET(ORACLE_OCI_VERSION "9") - ELSEIF (NOT ${OCIVER_TYPE} GREATER "90") - SET(ORACLE_OCI_VERSION "8I") - ELSE (${OCIVER_TYPE} GREATER "110") - SET(ORACLE_OCI_VERSION "10G_R2") - ENDIF (${OCIVER_TYPE} GREATER "110") - - MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}") -ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) - -MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARIES} (ORACLE_HOME='${ORACLE_HOME}')") -MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}") -MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") - -IF (ORACLE_FOUND) - # there *must* be OCI version defined for internal libraries - IF (ORACLE_OCI_VERSION) - ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - ELSE (ORACLE_OCI_VERSION) - MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - ENDIF (ORACLE_OCI_VERSION) - -ELSE (ORACLE_FOUND) - - MESSAGE(STATUS "Oracle not found.") - MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") - MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") - MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") - MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARIES}") - - IF (FORCE_ERROR) - MESSAGE(STATUS "Failed module info: ${FORCE_ERROR}") - ENDIF (FORCE_ERROR) - IF (Oracle_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Oracle library") - ELSE (Oracle_FIND_REQUIRED) - # setup the variables for silent continue - SET (ORACLE_INCLUDES "") - ENDIF (Oracle_FIND_REQUIRED) - -ENDIF (ORACLE_FOUND) +# TOra: Configure Oracle libraries +# +# ORACLE_FOUND - system has Oracle OCI +# ORACLE_HAS_XML - Oracle has XDK support(thick client installed) +# ORACLE_INCLUDES - where to find oci.h +# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI +# +# Components: CLNTSH, OCCI, XML, OCIEI +# CLNTSH is enabled by default +# for example: FIND_PACKAGE(Oracle REQUIRED CLNTSH OCCI) +# +# copyright (c) 2007 Petr Vanek <pe...@sc...> +# copyright (c) 2009 Ivan Brezina <ibr...@ib...> +# Redistribution and use is allowed according to the terms of the GPLv2 license. +# + +SET(ORACLE_FOUND "NO") +SET(ORACLE_HAS_XML "NO") +SET(ORACLE_HOME $ENV{ORACLE_HOME}) + +# "components" handling. It enables to find various independent libraries, +IF( Oracle_FIND_COMPONENTS ) + FOREACH( component ${Oracle_FIND_COMPONENTS} ) + STRING( TOUPPER ${component} _COMPONENT ) + SET( ORACLE_USE_${_COMPONENT} 1 ) + ENDFOREACH( component ) + + # legacy behaviour + IF (NOT ORACLE_USE_CLNTSH) + SET(ORACLE_USE_CLNTSH 1) + ENDIF (NOT ORACLE_USE_CLNTSH) + + # it looks like it's mandatory on macosx + IF (APPLE) + SET(ORACLE_USE_OCIEI 1) + ENDIF (APPLE) + +ENDIF( Oracle_FIND_COMPONENTS ) + + +IF (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) +ELSE (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION + ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include + # xdk + ${ORACLE_HOME}/xdk/include + # sdk + ${ORACLE_HOME}/sdk/include + # xe on windows + ${ORACLE_HOME}/OCI/include + ) +ENDIF (ORACLE_PATH_INCLUDES) + +IF (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) +ELSE (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION + # TODO add 32/64bit version here (lib32/lib64 on some platforms) + ${ORACLE_HOME}/lib + # xe on windows + ${ORACLE_HOME}/OCI/lib/MSVC + ${ORACLE_HOME} + # InstantClient on WinXP + ${ORACLE_HOME}/sdk/lib/msvc/ + ) +ENDIF (ORACLE_PATH_LIB) + +FIND_PATH( + ORACLE_INCLUDES + oci.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +SET(FORCE_ERROR 0) + + +IF (ORACLE_USE_CLNTSH) + FIND_LIBRARY( + ORACLE_LIBRARY_CLNTSH + NAMES libclntsh clntsh oci + PATHS ${ORACLE_LIB_LOCATION} + # NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_CLNTSH) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "CLNTSH") + ENDIF (Oracle_FIND_REQUIRED) + set(ORACLE_LIBRARY_CLNTSH "") + ENDIF (NOT ORACLE_LIBRARY_CLNTSH) +ENDIF (ORACLE_USE_CLNTSH) + + +#set (ORACLE_LIBRARY_OCCI "") +IF (ORACLE_USE_OCCI) + FIND_LIBRARY( + ORACLE_LIBRARY_OCCI + NAMES libocci occi + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_OCCI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCCI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCCI "") + ENDIF (NOT ORACLE_LIBRARY_OCCI) +ENDIF (ORACLE_USE_OCCI) + + +IF (ORACLE_USE_XML) + FIND_PATH( + ORACLE_INCLUDES_XML + xml.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_INCLUDES_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_INCLUDES_XML "") + ENDIF (NOT ORACLE_INCLUDES_XML) + + FIND_LIBRARY( + ORACLE_LIBRARY_XML + NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + endif (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_XML "") + ENDIF (NOT ORACLE_LIBRARY_XML) +ENDIF (ORACLE_USE_XML) + +IF (ORACLE_USE_OCIEI) + FIND_LIBRARY(ORACLE_LIBRARY_OCIEI + NAMES libociei ociei + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_OCIEI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCIEI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCIEI "") + ENDIF (NOT ORACLE_LIBRARY_OCIEI) +ENDIF (ORACLE_USE_OCIEI) + +IF (NOT FORCE_ERROR) + SET (ORACLE_LIBRARIES ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI}) +ENDIF (NOT FORCE_ERROR) +MESSAGE(STATUS "ORACLE_LIBRARY_CLNTSH ${ORACLE_LIBRARY_CLNTSH}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCCI ${ORACLE_LIBRARY_OCCI}") +MESSAGE(STATUS "ORACLE_LIBRARY_XML ${ORACLE_LIBRARY_XML}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCIEI ${ORACLE_LIBRARY_OCIEI}") + + +IF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) + SET(ORACLE_FOUND "YES") +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) + +IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + ADD_DEFINITIONS(-DORACLE_HAS_XML) + SET(ORACLE_HAS_XML "YES") + LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) +ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + +# guess OCI version +IF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) + TRY_RUN(OCIVER_TYPE OCIVER_COMPILED + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/cmake/modules/OCIVersion.c + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}" + OUTPUT_VARIABLE OCIVER) + + IF (${OCIVER_TYPE} GREATER "110") + SET(ORACLE_OCI_VERSION "11G") + ELSEIF (${OCIVER_TYPE} EQUAL "102") + SET(ORACLE_OCI_VERSION "10G_R2") + ELSEIF (${OCIVER_TYPE} EQUAL "101") + SET(ORACLE_OCI_VERSION "10G") + ELSEIF (${OCIVER_TYPE} EQUAL "91") + SET(ORACLE_OCI_VERSION "9") + ELSEIF (${OCIVER_TYPE} EQUAL "92") + SET(ORACLE_OCI_VERSION "9") + ELSEIF (NOT ${OCIVER_TYPE} GREATER "90") + SET(ORACLE_OCI_VERSION "8I") + ELSE (${OCIVER_TYPE} GREATER "110") + SET(ORACLE_OCI_VERSION "10G_R2") + ENDIF (${OCIVER_TYPE} GREATER "110") + + MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}") +ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) + +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARIES} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}") +MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") + +IF (ORACLE_FOUND) + # there *must* be OCI version defined for internal libraries + IF (ORACLE_OCI_VERSION) + ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + ELSE (ORACLE_OCI_VERSION) + MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + ENDIF (ORACLE_OCI_VERSION) + +ELSE (ORACLE_FOUND) + + MESSAGE(STATUS "Oracle not found.") + MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") + MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") + MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARIES}") + + IF (FORCE_ERROR) + MESSAGE(STATUS "Failed module info: ${FORCE_ERROR}") + ENDIF (FORCE_ERROR) + IF (Oracle_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Oracle library") + ELSE (Oracle_FIND_REQUIRED) + # setup the variables for silent continue + SET (ORACLE_INCLUDES "") + ENDIF (Oracle_FIND_REQUIRED) + +ENDIF (ORACLE_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2011-11-24 12:03:43
|
Revision: 4158 http://tora.svn.sourceforge.net/tora/?rev=4158&view=rev Author: subik Date: 2011-11-24 12:03:34 +0000 (Thu, 24 Nov 2011) Log Message: ----------- order of the libraries for oracle finding Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2011-11-24 00:55:41 UTC (rev 4157) +++ trunk/tora/cmake/modules/FindOracle.cmake 2011-11-24 12:03:34 UTC (rev 4158) @@ -50,6 +50,8 @@ ${ORACLE_HOME}/sdk/include # xe on windows ${ORACLE_HOME}/OCI/include + # instant client from rpm + /usr/include/oracle/11.2/client${LIB_SUFFIX}/ ) ENDIF (ORACLE_PATH_INCLUDES) @@ -64,6 +66,8 @@ ${ORACLE_HOME} # InstantClient on WinXP ${ORACLE_HOME}/sdk/lib/msvc/ + # Instant client from rpm + /usr/lib${LIB_SUFFIX}/ ) ENDIF (ORACLE_PATH_LIB) @@ -78,11 +82,15 @@ IF (ORACLE_USE_CLNTSH) + # The NO_DEFAULT_PATH is necessary here in the case there is Oracle DB + # *and* instant client installed. The order is given in ORACLE_LIB_LOCATION. + # See above. FIND_LIBRARY( ORACLE_LIBRARY_CLNTSH NAMES libclntsh clntsh oci PATHS ${ORACLE_LIB_LOCATION} - # NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + NO_DEFAULT_PATH + #NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) IF (NOT ORACLE_LIBRARY_CLNTSH) IF (Oracle_FIND_REQUIRED) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2013-03-16 22:16:10
|
Revision: 4578 http://sourceforge.net/p/tora/code/4578 Author: subik Date: 2013-03-16 22:16:05 +0000 (Sat, 16 Mar 2013) Log Message: ----------- cmake Find.Oracle.cmake relicensed to BSD Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2013-03-15 20:34:51 UTC (rev 4577) +++ trunk/tora/cmake/modules/FindOracle.cmake 2013-03-16 22:16:05 UTC (rev 4578) @@ -11,7 +11,7 @@ # # copyright (c) 2007 Petr Vanek <pe...@sc...> # copyright (c) 2009 Ivan Brezina <ibr...@ib...> -# Redistribution and use is allowed according to the terms of the GPLv2 license. +# Redistribution and use is allowed according to the terms of the BSD license. # SET(ORACLE_FOUND "NO") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2013-08-21 08:23:16
|
Revision: 4773 http://sourceforge.net/p/tora/code/4773 Author: subik Date: 2013-08-21 08:23:12 +0000 (Wed, 21 Aug 2013) Log Message: ----------- support for 'find 12c' in FindOracle (but it seems like ORACLE_OCI_VERSION is not used anymore now) Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2013-08-21 00:41:33 UTC (rev 4772) +++ trunk/tora/cmake/modules/FindOracle.cmake 2013-08-21 08:23:12 UTC (rev 4773) @@ -85,7 +85,9 @@ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}" OUTPUT_VARIABLE OCIVER) - IF (${OCIVER_TYPE} GREATER "110") + IF (${OCIVER_TYPE} GREATER "120") + SET(ORACLE_OCI_VERSION "12C") + ELSEIF (${OCIVER_TYPE} GREATER "110") SET(ORACLE_OCI_VERSION "11G") ELSEIF (${OCIVER_TYPE} EQUAL "102") SET(ORACLE_OCI_VERSION "10G_R2") @@ -99,7 +101,7 @@ SET(ORACLE_OCI_VERSION "8I") ELSE (${OCIVER_TYPE} GREATER "110") SET(ORACLE_OCI_VERSION "10G_R2") - ENDIF (${OCIVER_TYPE} GREATER "110") + ENDIF () MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2013-10-05 19:32:07
|
Revision: 4859 http://sourceforge.net/p/tora/code/4859 Author: subik Date: 2013-10-05 19:32:01 +0000 (Sat, 05 Oct 2013) Log Message: ----------- find oracle: instantclient default path for OS X using macports Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2013-10-05 06:48:00 UTC (rev 4858) +++ trunk/tora/cmake/modules/FindOracle.cmake 2013-10-05 19:32:01 UTC (rev 4859) @@ -47,6 +47,8 @@ ${ORACLE_HOME}/OCI/include # instant client from rpm /usr/include/oracle/11.2/client${LIB_SUFFIX}/ + # instantclient on OS X from macports + /opt/local/lib/oracle/sdk/include/ ) ENDIF (ORACLE_PATH_INCLUDES) @@ -63,6 +65,8 @@ ${ORACLE_HOME}/sdk/lib/msvc/ # Instant client from rpm /usr/lib${LIB_SUFFIX}/ + # instant client on OS X from macports + /opt/local/lib/oracle/ ) ENDIF (ORACLE_PATH_LIB) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |