[Tora-cvs] SF.net SVN: tora:[3176] trunk/tora/cmake/modules/FindOracle.cmake

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

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.