From: <ibr...@us...> - 2013-03-08 21:13:54
|
Revision: 4565 http://sourceforge.net/p/tora/code/4565 Author: ibre5041 Date: 2013-03-08 21:13:52 +0000 (Fri, 08 Mar 2013) Log Message: ----------- sync with tora trunk Modified Paths: -------------- branches/tora3/cmake/modules/FindOracle.cmake Modified: branches/tora3/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora3/cmake/modules/FindOracle.cmake 2013-03-08 21:08:07 UTC (rev 4564) +++ branches/tora3/cmake/modules/FindOracle.cmake 2013-03-08 21:13:52 UTC (rev 4565) @@ -30,11 +30,6 @@ 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 ) @@ -50,6 +45,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 +61,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 +77,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 libclntsh.so.11.1 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:50
|
Revision: 4579 http://sourceforge.net/p/tora/code/4579 Author: subik Date: 2013-03-16 22:16:45 +0000 (Sat, 16 Mar 2013) Log Message: ----------- FindOracle.cmake synced with trunk Modified Paths: -------------- branches/tora3/cmake/modules/FindOracle.cmake Modified: branches/tora3/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora3/cmake/modules/FindOracle.cmake 2013-03-16 22:16:05 UTC (rev 4578) +++ branches/tora3/cmake/modules/FindOracle.cmake 2013-03-16 22:16:45 UTC (rev 4579) @@ -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") @@ -76,16 +76,53 @@ SET(FORCE_ERROR 0) +# guess OCI version +# we need it before lib checking because of OS X bugs in instant client (see below) +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}") + + IF (APPLE) + IF (${OCIVER_TYPE} LESS 110) + SET(ORACLE_USE_OCIEI 1) + message(STATUS " APPLE requires libociei for instantclient < 11, enforcing ociei") + ENDIF () + ENDIF (APPLE) + +ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) + + 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 libclntsh.so.11.1 clntsh oci + 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) @@ -174,33 +211,6 @@ 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}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |