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

Merge remote-tracking branch 'svn/branches/cmake_config_files' into windows 

Conflicts:
	.gitsvnextmodules
	CMakeLists.txt
	gtsam/CMakeLists.txt
release/4.3a0
Richard Roberts 2012-05-24 20:11:26 +00:00
parent 42853e0e59 a164a66b77
commit 5039531c3b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -102,7 +102,7 @@ if (GTSAM_BUILD_TESTS)
endif() endif()
# Find boost # Find boost
if(MSVC) if(CYGWIN OR MSVC OR WIN32)
set(Boost_USE_STATIC_LIBS 1) set(Boost_USE_STATIC_LIBS 1)
endif() endif()
find_package(Boost 1.40 COMPONENTS serialization system chrono filesystem REQUIRED) find_package(Boost 1.40 COMPONENTS serialization system chrono filesystem REQUIRED)
@ -140,6 +140,10 @@ if (GTSAM_BUILD_UNSTABLE)
add_subdirectory(gtsam_unstable) add_subdirectory(gtsam_unstable)
endif(GTSAM_BUILD_UNSTABLE) endif(GTSAM_BUILD_UNSTABLE)
# Make config file
include(GtsamMakeConfigFile)
GtsamMakeConfigFile(gtsam)
# Set up CPack # Set up CPack
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GTSAM") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GTSAM")
set(CPACK_PACKAGE_VENDOR "Frank Dellaert, Georgia Institute of Technology") set(CPACK_PACKAGE_VENDOR "Frank Dellaert, Georgia Institute of Technology")