12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for Boost 1.50

release/4.3a0
Chris Beall 2012-07-24 20:44:13 +00:00
parent 065b7ee1e6
commit a66a42189c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -109,7 +109,7 @@ if(CYGWIN OR MSVC OR WIN32)
set(Boost_USE_STATIC_LIBS 1) set(Boost_USE_STATIC_LIBS 1)
endif() endif()
find_package(Boost 1.43 COMPONENTS serialization system filesystem thread date_time regex REQUIRED) 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 # General build settings
include_directories( include_directories(

4
gtsam/CMakeLists.txt
View File

@ -85,7 +85,7 @@ message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
if (GTSAM_BUILD_STATIC_LIBRARY) if (GTSAM_BUILD_STATIC_LIBRARY)
message(STATUS "Building GTSAM - static") message(STATUS "Building GTSAM - static")
add_library(gtsam-static STATIC ${gtsam_srcs}) 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 set_target_properties(gtsam-static PROPERTIES
OUTPUT_NAME gtsam OUTPUT_NAME gtsam
CLEAN_DIRECT_OUTPUT 1 CLEAN_DIRECT_OUTPUT 1
@ -100,7 +100,7 @@ endif (GTSAM_BUILD_STATIC_LIBRARY)
if (GTSAM_BUILD_SHARED_LIBRARY) if (GTSAM_BUILD_SHARED_LIBRARY)
message(STATUS "Building GTSAM - shared") message(STATUS "Building GTSAM - shared")
add_library(gtsam-shared SHARED ${gtsam_srcs}) 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 set_target_properties(gtsam-shared PROPERTIES
OUTPUT_NAME gtsam OUTPUT_NAME gtsam
CLEAN_DIRECT_OUTPUT 1 CLEAN_DIRECT_OUTPUT 1