[Liblas-commits] hg: [cmake] Enabled searching for Oracle OCCI library

[liblas-commits at liblas.org]

changeset c66c7b4d575c in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=c66c7b4d575c
summary: [cmake] Enabled searching for Oracle OCCI library

diffstat:

 build/cmake/FindOracle.cmake |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (26 lines):

diff -r d77a114e0cfd -r c66c7b4d575c build/cmake/FindOracle.cmake
--- a/build/cmake/FindOracle.cmake	Fri Jan 08 00:29:59 2010 +0000
+++ b/build/cmake/FindOracle.cmake	Fri Jan 08 00:48:56 2010 +0000
@@ -42,10 +42,9 @@
   ${ORACLE_HOME}/OCI/include # Oracle XE on Windows
   )
 
-set(ORACLE_OCI_NAMES libclntsh clntsh oci)
-set(ORACLE_NNZ_NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32)
-# TODO: Not used at the moment
-#set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)
+set(ORACLE_OCI_NAMES clntsh libclntsh oci)
+set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 ociw32)
+set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)
 
 set(ORACLE_LIB_DIR 
   ${ORACLE_HOME}/lib
@@ -53,7 +52,7 @@
 )
 
 find_library(ORACLE_OCI_LIBRARY  NAMES ${ORACLE_OCI_NAMES} PATHS ${ORACLE_LIB_DIR})
-#find_library(ORACLE_OCCI_LIBRARY NAMES ${ORACLE_OCCI_NAMES} PATHS ${ORACLE_LIB_DIR})
+find_library(ORACLE_OCCI_LIBRARY NAMES ${ORACLE_OCCI_NAMES} PATHS ${ORACLE_LIB_DIR})
 find_library(ORACLE_NNZ_LIBRARY NAMES ${ORACLE_NNZ_NAMES} PATHS ${ORACLE_LIB_DIR})
 
 set(ORACLE_LIBRARY ${ORACLE_OCI_LIBRARY} ${ORACLE_OCCI_LIBRARY} ${ORACLE_NNZ_LIBRARY})