[Tora-cvs] SF.net SVN: tora:[3304] trunk/tora

[<su...@us...>]

Revision: 3304
          http://tora.svn.sourceforge.net/tora/?rev=3304&view=rev
Author:   subik
Date:     2009-09-21 13:16:45 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
ability to disable oracle (for gentoo ebuild policies)

Modified Paths:
--------------
    trunk/tora/CMakeLists.txt
    trunk/tora/README.CMAKE

Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt	2009-09-21 13:11:29 UTC (rev 3303)
+++ trunk/tora/CMakeLists.txt	2009-09-21 13:16:45 UTC (rev 3304)
@@ -182,17 +182,24 @@
 ENDIF (WANT_INTERNAL_QSCINTILLA)
 
 
-FIND_PACKAGE(Oracle)
-IF(ORACLE_FOUND)
-    MESSAGE("Oracle OCI Library Found OK")
-    # what else is hidden in the ifdef hell?!
-    ADD_DEFINITIONS("-DDBLINK")
-ELSE(ORACLE_FOUND)
-    MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support")
+IF (NO_ORACLE)
+    MESSAGE(STATUS "Oracle support is disabled by user choice")
     ADD_DEFINITIONS("-DTO_NO_ORACLE")
-ENDIF(ORACLE_FOUND)
+ELSE (NO_ORACLE)
 
+  FIND_PACKAGE(Oracle)
+  IF(ORACLE_FOUND)
+      MESSAGE("Oracle OCI Library Found OK")
+      # what else is hidden in the ifdef hell?!
+      ADD_DEFINITIONS("-DDBLINK")
+  ELSE(ORACLE_FOUND)
+      MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support")
+      ADD_DEFINITIONS("-DTO_NO_ORACLE")
+  ENDIF(ORACLE_FOUND)
 
+ENDIF (NO_ORACLE)
+
+
 FIND_PACKAGE(PostgreSQL)
 IF (POSTGRESQL_FOUND)
     ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL)

Modified: trunk/tora/README.CMAKE
===================================================================
--- trunk/tora/README.CMAKE	2009-09-21 13:11:29 UTC (rev 3303)
+++ trunk/tora/README.CMAKE	2009-09-21 13:16:45 UTC (rev 3304)
@@ -45,7 +45,10 @@
 [8, 8I, 9I, 10G, 10G_R2]. Example:
 -DORACLE_OCI_VERSION=10G_R2
 
+You can switch off Oracle support with:
+-DNO_ORACLE=1
 
+
 TOra requires PostgreSQL development environment to enable
 full PgSQL support (native cancel etc.).
 This environment shoud be found automatically on UNIXes. But you can


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.