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

Removing unnecessary boost dependencies - may need more fixing

release/4.3a0
Alex Cunningham 2012-06-05 19:25:31 +00:00
parent 575fcb999b
commit 00b6f177d2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -101,7 +101,7 @@ endif()
if(CYGWIN OR MSVC OR WIN32) if(CYGWIN OR MSVC OR WIN32)
set(Boost_USE_STATIC_LIBS 1) set(Boost_USE_STATIC_LIBS 1)
endif() endif()
find_package(Boost 1.42 COMPONENTS serialization system filesystem thread REQUIRED) find_package(Boost 1.42 COMPONENTS serialization REQUIRED)
# General build settings # General build settings
include_directories( include_directories(

4
wrap/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# Build/install Wrap # Build/install Wrap
find_package(Boost 1.42 COMPONENTS system filesystem thread REQUIRED)
# Build the executable itself # Build the executable itself
file(GLOB wrap_srcs "*.cpp") file(GLOB wrap_srcs "*.cpp")
list(REMOVE_ITEM wrap_srcs wrap.cpp) list(REMOVE_ITEM wrap_srcs wrap.cpp)
@ -18,7 +20,7 @@ install(FILES matlab.h DESTINATION include/wrap)
# Build tests # Build tests
if (GTSAM_BUILD_TESTS) if (GTSAM_BUILD_TESTS)
add_definitions(-DTOPSRCDIR="${CMAKE_SOURCE_DIR}") add_definitions(-DTOPSRCDIR="${CMAKE_SOURCE_DIR}")
set(wrap_local_libs wrap_lib) set(wrap_local_libs wrap_lib ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
gtsam_add_subdir_tests("wrap" "${wrap_local_libs}" "${wrap_local_libs}" "") gtsam_add_subdir_tests("wrap" "${wrap_local_libs}" "${wrap_local_libs}" "")
endif(GTSAM_BUILD_TESTS) endif(GTSAM_BUILD_TESTS)