[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset 8dfbcd6806c4 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=8dfbcd6806c4
summary: only link oracle stuff against las2oci, not everything

changeset ebaaaf3dc720 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=ebaaaf3dc720
summary: don't look for occi and nnz when using msvc (assuming instant client here)

diffstat:

 apps/CMakeLists.txt            |  3 +--
 cmake/modules/FindOracle.cmake |  2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 51c33c0ab0b0 -r ebaaaf3dc720 apps/CMakeLists.txt
--- a/apps/CMakeLists.txt	Thu Aug 26 14:07:00 2010 -0600
+++ b/apps/CMakeLists.txt	Thu Aug 26 14:28:05 2010 -0600
@@ -67,7 +67,6 @@
     ${GEOTIFF_LIBRARY}
     ${GDAL_LIBRARY}
     ${SPATIALINDEX_LIBRARY}
-    ${ORACLE_LIBRARY}
     ${LIBXML2_LIBRARIES})
 
 link_directories(${Boost_LIBRARY_DIRS})
@@ -128,7 +127,7 @@
 # Build las2oci
 if(LAS2OCI)
     add_executable(${LAS2OCI} las2oci.cpp oci_wrapper.cpp kdx_util.cpp oci_util.cpp laskernel.cpp chipper.cpp)
-    target_link_libraries(${LAS2OCI} ${APPS_CPP_DEPENDENCIES} ${Boost_LIBRARIES})
+    target_link_libraries(${LAS2OCI} ${APPS_CPP_DEPENDENCIES} ${Boost_LIBRARIES} ${ORACLE_LIBRARY})
 endif()
 
 if(BIGFILE_TEST)
diff -r 51c33c0ab0b0 -r ebaaaf3dc720 cmake/modules/FindOracle.cmake
--- a/cmake/modules/FindOracle.cmake	Thu Aug 26 14:07:00 2010 -0600
+++ b/cmake/modules/FindOracle.cmake	Thu Aug 26 14:28:05 2010 -0600
@@ -54,8 +54,10 @@
   ${ORACLE_HOME}/OCI/lib/MSVC)
 
 find_library(ORACLE_OCI_LIBRARY  NAMES ${ORACLE_OCI_NAMES} PATHS ${ORACLE_LIB_DIR})
+if (NOT MSVC)
 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})
+endif(NOT MSVC)
 
 set(ORACLE_LIBRARY ${ORACLE_OCI_LIBRARY} ${ORACLE_OCCI_LIBRARY} ${ORACLE_NNZ_LIBRARY})