[Liblas-commits] hg: Fixed linking against Boost libraries when building with Vis...

[liblas-commits at liblas.org]

changeset 4c25e26c4d59 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=4c25e26c4d59
summary: Fixed linking against Boost libraries when building with Visual Studio (tested with 2005). By default, disable dynamic linking, use static multi-threaded. If dynamic linking is requied, static linking has to be disabled explicitly. Added Boost_LIBRARY_DIRS to linker directories.

diffstat:

 CMakeLists.txt      |  4 +++-
 apps/CMakeLists.txt |  5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 88f771613187 -r 4c25e26c4d59 CMakeLists.txt
--- a/CMakeLists.txt	Thu Aug 26 01:28:50 2010 +0100
+++ b/CMakeLists.txt	Thu Aug 26 01:45:49 2010 +0100
@@ -23,7 +23,6 @@
 
 endif()
 
-
 # Name of test suite runner
 set(LIBLAS_UNIT_TEST liblas_test)
 
@@ -122,6 +121,9 @@
 
 # Boost C++ Libraries support - required
 message(STATUS "Searching for Boost 1.38+ - done")
+
+set(Boost_USE_STATIC_LIBS   ON)
+set(Boost_USE_MULTITHREADED ON)
 find_package(Boost 1.38 COMPONENTS program_options REQUIRED)
 
 if(Boost_FOUND AND Boost_PROGRAM_OPTIONS_FOUND)
diff -r 88f771613187 -r 4c25e26c4d59 apps/CMakeLists.txt
--- a/apps/CMakeLists.txt	Thu Aug 26 01:28:50 2010 +0100
+++ b/apps/CMakeLists.txt	Thu Aug 26 01:45:49 2010 +0100
@@ -31,14 +31,11 @@
 set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-
-
 # Utilities depending on 3rd-pary libraries
 if(GDAL_FOUND)
     set(LAS2OGR las2ogr)
 endif()
 
-
 if(ORACLE_FOUND AND GDAL_FOUND)
     set(LAS2OCI las2oci)
 endif()
@@ -73,6 +70,8 @@
     ${ORACLE_LIBRARY}
     ${LIBXML2_LIBRARIES})
 
+link_directories(${Boost_LIBRARY_DIRS})
+
 # Build lasinfo
 if(LASINFO)
     set(LASINFO_SRC lascommon.c ${LASINFO}.c)