[Liblas-commits] hg: add back the libxml2 searching. Have Boost static/multithre...

[liblas-commits at liblas.org]

changeset f42350719b60 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=f42350719b60
summary: add back the libxml2 searching.  Have Boost static/multithreaded lib stuff only be set for WIN32/MSVC case, which is how we prescribe building on that environment with the boostpro.com installer

diffstat:

 CMakeLists.txt |  30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 5ac9800e2d83 -r f42350719b60 CMakeLists.txt
--- a/CMakeLists.txt	Mon Nov 22 12:16:15 2010 -0600
+++ b/CMakeLists.txt	Mon Nov 22 16:11:21 2010 -0600
@@ -150,8 +150,17 @@
 # Boost C++ Libraries support - required
 message(STATUS "Searching for Boost 1.38+ - done")
 
-set(Boost_USE_STATIC_LIBS   ON)
-set(Boost_USE_MULTITHREADED ON)
+# Default to using static, multithreaded libraries for 
+# linking under MSVC.  This is because we show users how to 
+# use boostpro.com installer and install those options when linking 
+# on windows in the compilation documentation.
+if(WIN32)
+  if (MSVC)
+    set(Boost_USE_STATIC_LIBS   ON)
+    set(Boost_USE_MULTITHREADED ON)
+  endif(MSVC)
+endif(WIN32)
+
 # NOTE: Add iostreams to COMPONENTS list to enable bigfile_boost_iostreams_test
 find_package(Boost 1.38 COMPONENTS program_options REQUIRED)
 
@@ -164,6 +173,23 @@
 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")