[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset df9ac6adeab4 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=df9ac6adeab4
summary: Removed libxml2 from CMake configuration

changeset b761c8ead21c in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=b761c8ead21c
summary: Removed libxml2 from CMake configuration

diffstat:

 CMakeLists.txt                 |  13 -------------
 apps/CMakeLists.txt            |   6 ++----
 cmake/modules/FindOracle.cmake |   2 ++
 src/CMakeLists.txt             |   3 +--
 4 files changed, 5 insertions(+), 19 deletions(-)

diffs (73 lines):

diff -r 51c33c0ab0b0 -r b761c8ead21c CMakeLists.txt
--- a/CMakeLists.txt	Thu Aug 26 14:07:00 2010 -0600
+++ b/CMakeLists.txt	Thu Aug 26 21:33:39 2010 +0100
@@ -136,19 +136,6 @@
 mark_as_advanced(CLEAR Boost_LIBRARY_DIRS) 
 link_directories(${Boost_LIBRARY_DIRS}) 
 
-# libxml2 support - optional, default=ON
-set(WITH_LIBXML2 FALSE CACHE BOOL "Choose if libxml2 support should be built ")
-
-if(WITH_LIBXML2)
-    find_package(LibXml2)
-    mark_as_advanced(CLEAR LIBXML2_INCLUDE_DIR)
-    mark_as_advanced(CLEAR LIBXML2_LIBRARIES) 
-    if(LIBXML2_FOUND)
-        include_directories(${LIBXML2_INCLUDE_DIR})
-        add_definitions(-DHAVE_LIBXML2=1)
-    endif()
-endif()
-
 # GeoTIFF support - optional, default=OFF
 set(WITH_GEOTIFF FALSE CACHE BOOL "Choose if GeoTIFF support should be built")
 
diff -r 51c33c0ab0b0 -r b761c8ead21c apps/CMakeLists.txt
--- a/apps/CMakeLists.txt	Thu Aug 26 14:07:00 2010 -0600
+++ b/apps/CMakeLists.txt	Thu Aug 26 21:33:39 2010 +0100
@@ -66,9 +66,7 @@
     ${TIFF_LIBRARY}
     ${GEOTIFF_LIBRARY}
     ${GDAL_LIBRARY}
-    ${SPATIALINDEX_LIBRARY}
-    ${ORACLE_LIBRARY}
-    ${LIBXML2_LIBRARIES})
+    ${SPATIALINDEX_LIBRARY})
 
 link_directories(${Boost_LIBRARY_DIRS})
 
@@ -128,7 +126,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 b761c8ead21c 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 21:33:39 2010 +0100
@@ -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})
 
diff -r 51c33c0ab0b0 -r b761c8ead21c src/CMakeLists.txt
--- a/src/CMakeLists.txt	Thu Aug 26 14:07:00 2010 -0600
+++ b/src/CMakeLists.txt	Thu Aug 26 21:33:39 2010 +0100
@@ -205,8 +205,7 @@
   ${TIFF_LIBRARY}
   ${GEOTIFF_LIBRARY}
   ${GDAL_LIBRARY}
-  ${SPATIALINDEX_LIBRARY}
-  ${LIBXML2_LIBRARIES})
+  ${SPATIALINDEX_LIBRARY})
 
 ###############################################################################
 # Targets installation