[Liblas-commits] hg: Removed WITH_BOOST option and made Boost a required dependen...

[liblas-commits at liblas.org]

changeset 0528a32de5bc in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=0528a32de5bc
summary: Removed WITH_BOOST option and made Boost a required dependency. In order to build libLAS, it is enough to set BOOST_INCLUDEDIR value.

diffstat:

 CMakeLists.txt |  31 +++++++++++--------------------
 1 files changed, 11 insertions(+), 20 deletions(-)

diffs (53 lines):

diff -r 6f123366fe23 -r 0528a32de5bc CMakeLists.txt
--- a/CMakeLists.txt	Mon Jul 26 10:14:37 2010 -0500
+++ b/CMakeLists.txt	Mon Jul 26 17:18:23 2010 +0100
@@ -134,7 +134,15 @@
 ###############################################################################
 # Search for dependencies
 
-# libxml2 support - required, default=ON
+# Boost C++ Libraries support - required
+message(STATUS "Searching for Boost 1.38+ - done")
+find_package(Boost 1.38 REQUIRED)
+
+if(Boost_FOUND)
+  include_directories(${Boost_INCLUDE_DIRS})
+endif()
+
+# libxml2 support - optional, default=ON
 set(WITH_LIBXML2 FALSE CACHE BOOL "Choose if libxml2 support should be built ")
 
 if(WITH_LIBXML2)
@@ -147,24 +155,6 @@
     endif()
 endif()
 
-
-
-# Boost C++ Libraries support - optional, default=ON
-set(WITH_BOOST TRUE CACHE BOOL "Choose if Boost C++ Libraries support should be built (required)")
-
-# TODO: Decide minimum required version of Boost. Is 1.38 OK? --mloskot
-if(WITH_BOOST)
-    message(STATUS "Searching for Boost 1.38+ - done")
-
-    find_package(Boost 1.38 REQUIRED)
-
-    if(Boost_FOUND)
-      include_directories(${Boost_INCLUDE_DIRS})
-    endif()
-endif()
-
-
-
 # GeoTIFF support - optional, default=OFF
 set(WITH_GEOTIFF FALSE CACHE BOOL "Choose if GeoTIFF support should be built")
 
@@ -333,4 +323,5 @@
 
 if (WIN32)
     include(BuildOSGeo4W)
-endif(WIN32)
\ No newline at end of file
+endif(WIN32)
+