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

In progress with cmake config files

release/4.3a0
Richard Roberts 2012-05-21 23:38:25 +00:00
parent 1bcb3966f3
commit a164a66b77
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -93,6 +93,9 @@ if (GTSAM_BUILD_TESTS)
endif()
# Find boost
if(CYGWIN OR MSVC OR WIN32)
set(Boost_USE_STATIC_LIBS 1)
endif()
find_package(Boost 1.40 COMPONENTS serialization REQUIRED)
# General build settings
@ -128,6 +131,10 @@ if (GTSAM_BUILD_UNSTABLE)
add_subdirectory(gtsam_unstable)
endif(GTSAM_BUILD_UNSTABLE)
# Make config file
include(GtsamMakeConfigFile)
GtsamMakeConfigFile(gtsam)
# Set up CPack
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GTSAM")
set(CPACK_PACKAGE_VENDOR "Frank Dellaert, Georgia Institute of Technology")

2
gtsam/CMakeLists.txt
View File

@ -97,6 +97,6 @@ if (GTSAM_BUILD_SHARED_LIBRARY)
CLEAN_DIRECT_OUTPUT 1
VERSION ${gtsam_version}
SOVERSION ${gtsam_soversion})
install(TARGETS gtsam-shared LIBRARY DESTINATION lib )
install(TARGETS gtsam-shared DESTINATION lib )
endif(GTSAM_BUILD_SHARED_LIBRARY)

2
gtsam/base/cholesky.h
View File

@ -34,7 +34,7 @@ struct NegativeMatrixException : public std::exception {
Matrix A; ///< The original matrix attempted to factor
Matrix U; ///< The produced upper-triangular factor
Matrix D; ///< The produced diagonal factor
Detail(const Matrix& _A, const Matrix& _U, const Matrix& _D) /**< Detail constructor */ : A(_A), U(_U), D(_D) {}
Detail(const Matrix& A, const Matrix& U, const Matrix& D) /**< Detail constructor */ : A(A), U(U), D(D) {}
void print(const std::string& str = "") const {
std::cout << str << "\n";
gtsam::print(A, " A: ");