From: <nn...@us...> - 2007-09-20 13:09:14
|
Revision: 2149 http://tora.svn.sourceforge.net/tora/?rev=2149&view=rev Author: nneul Date: 2007-09-20 06:08:50 -0700 (Thu, 20 Sep 2007) Log Message: ----------- add additional search path Modified Paths: -------------- branches/tora-1.4/tora/cmake/modules/FindOracle.cmake Modified: branches/tora-1.4/tora/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-1.4/tora/cmake/modules/FindOracle.cmake 2007-09-20 13:00:14 UTC (rev 2148) +++ branches/tora-1.4/tora/cmake/modules/FindOracle.cmake 2007-09-20 13:08:50 UTC (rev 2149) @@ -21,6 +21,7 @@ # fixme. It's harcoded instant client # /usr/include/oracle/10.2.0.3/client ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include ) SET( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2007-12-22 11:04:36
|
Revision: 2369 http://tora.svn.sourceforge.net/tora/?rev=2369&view=rev Author: subik Date: 2007-12-22 03:04:38 -0800 (Sat, 22 Dec 2007) Log Message: ----------- OCI version setting when no Oracle found Modified Paths: -------------- branches/tora-1.4/tora/cmake/modules/FindOracle.cmake Modified: branches/tora-1.4/tora/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-1.4/tora/cmake/modules/FindOracle.cmake 2007-12-21 12:27:04 UTC (rev 2368) +++ branches/tora-1.4/tora/cmake/modules/FindOracle.cmake 2007-12-22 11:04:38 UTC (rev 2369) @@ -13,11 +13,6 @@ set(ORACLE_HOME $ENV{ORACLE_HOME}) -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_PATH_INCLUDES) SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) @@ -72,6 +67,13 @@ IF (NOT ORACLE_FIND_QUIETLY) MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") 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) + 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") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-01-28 09:58:14
|
Revision: 2486 http://tora.svn.sourceforge.net/tora/?rev=2486&view=rev Author: subik Date: 2008-01-28 01:58:19 -0800 (Mon, 28 Jan 2008) Log Message: ----------- guess OCI version automagically (requires awk so it's unix only now) Modified Paths: -------------- branches/tora-1.4/tora/cmake/modules/FindOracle.cmake Modified: branches/tora-1.4/tora/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-1.4/tora/cmake/modules/FindOracle.cmake 2008-01-28 03:18:51 UTC (rev 2485) +++ branches/tora-1.4/tora/cmake/modules/FindOracle.cmake 2008-01-28 09:58:19 UTC (rev 2486) @@ -63,6 +63,34 @@ ENDIF (ORACLE_LIBRARY) +# guess OCI version +IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) + FIND_PROGRAM(AWK awk) + SET (sqlplus_version "${ORACLE_HOME}/bin/sqlplus -version | ${AWK} '/Release/ {print $3}'") + EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) + MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") + + # WARNING! + # MATCHES operator is using Cmake regular expression. + # so the e.g. 9.* does not expand like shell file mask + # but as "9 and then any sequence of characters" + IF (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "8I") + ELSEIF (${sqlplus_out} MATCHES "9.*") + SET(ORACLE_OCI_VERSION "9") +# do not change the order of the ora10 checking! + ELSEIF (${sqlplus_out} MATCHES "10.2.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ELSEIF (${sqlplus_out} MATCHES "10.*") + SET(ORACLE_OCI_VERSION "10G") + ELSE (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ENDIF (${sqlplus_out} MATCHES "8.*") + + MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") +ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) + + IF (ORACLE_FOUND) IF (NOT ORACLE_FIND_QUIETLY) MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |