From a66a42189cd9bcb6c9a595a7650003e0c85279b4 Mon Sep 17 00:00:00 2001 From: Chris Beall Date: Tue, 24 Jul 2012 20:44:13 +0000 Subject: [PATCH] fixes for Boost 1.50 --- CMakeLists.txt | 2 +- gtsam/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66fc43c50..d94f259f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ if(CYGWIN OR MSVC OR WIN32) set(Boost_USE_STATIC_LIBS 1) endif() find_package(Boost 1.43 COMPONENTS serialization system filesystem thread date_time regex REQUIRED) -set(GTSAM_BOOST_LIBRARIES ${Boost_SERIALIZATION_LIBRARY}) +set(GTSAM_BOOST_LIBRARIES ${Boost_SERIALIZATION_LIBRARY} ${Boost_SYSTEM_LIBRARY}) # General build settings include_directories( diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 39ae67507..56bce727b 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -85,7 +85,7 @@ message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}") if (GTSAM_BUILD_STATIC_LIBRARY) message(STATUS "Building GTSAM - static") add_library(gtsam-static STATIC ${gtsam_srcs}) - target_link_libraries(gtsam-static ${Boost_SERIALIZATION_LIBRARY}) + target_link_libraries(gtsam-static ${GTSAM_BOOST_LIBRARIES}) set_target_properties(gtsam-static PROPERTIES OUTPUT_NAME gtsam CLEAN_DIRECT_OUTPUT 1 @@ -100,7 +100,7 @@ endif (GTSAM_BUILD_STATIC_LIBRARY) if (GTSAM_BUILD_SHARED_LIBRARY) message(STATUS "Building GTSAM - shared") add_library(gtsam-shared SHARED ${gtsam_srcs}) - target_link_libraries(gtsam-shared ${Boost_SERIALIZATION_LIBRARY}) + target_link_libraries(gtsam-shared ${GTSAM_BOOST_LIBRARIES}) set_target_properties(gtsam-shared PROPERTIES OUTPUT_NAME gtsam CLEAN_DIRECT_OUTPUT 1