diff --git a/README b/README index 27a140c22..128c3afea 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ Please see USAGE for an example on how to use GTSAM. The code is organized according to the following directory structure: - 3rdparty local copies of third party libraries - currently the headers for Eigen3 + 3rdparty local copies of third party libraries - Eigen3 and CCOLAMD base provides some base Math and data structures, as well as test-related utilities geometry points, poses, tensors, etc inference core graphical model inference such as factor graphs, junction trees, Bayes nets, Bayes trees @@ -41,13 +41,6 @@ GTSAM requires the following libraries to be installed on your system: - BOOST version 1.40 or greater (install through Linux repositories or MacPorts) 2) -GTSAM uses CCOLAMD to find good variable elimination orders. You can download -it from Tim Davis's website: http://www.cise.ufl.edu/research/sparse/ccolamd/ -Then, pass the following arguments (paths are just examples) to ./configure: ---with-ccolamd-inc=/usr/local/include ---with-ccolamd-lib=/usr/local/lib - -3) GTSAM makes extensive use of debug assertions, even for checking input of the functions you will call. These assertions are disabled when NDEBUG is defined. Thus, we strongly recommend compiling GTSAM and your own code without @@ -62,7 +55,7 @@ to find. NOTE: The native Snow Leopard g++ compiler/library contains a bug that makes it impossible to use _GLIBCXX_DEBUG. MacPorts g++ compilers do work with it though. -4) +3) Putting the above together, here are some sample ./configure commands for compiling gtsam: diff --git a/configure.ac b/configure.ac index fe6e77f40..acd5e6a78 100644 --- a/configure.ac +++ b/configure.ac @@ -142,22 +142,6 @@ AX_BOOST_BASE([1.40]) # ]) #AC_SUBST([boost]) -## ask for ccolamd library include directory -#AC_ARG_WITH([ccolamd-inc], -# [AS_HELP_STRING([--with-ccolamd-inc], -# [specify the CCOLAMD library include directory (defaults to /HOME/include/ccolamd)])], -# [CCOLAMDInc=$withval], -# [CCOLAMDInc=${HOME}/include/ccolamd]) -#AC_SUBST([CCOLAMDInc]) -# -## ask for sparse library lib directory -#AC_ARG_WITH([ccolamd-lib], -# [AS_HELP_STRING([--with-ccolamd-lib], -# [specify the CCOLAMD library lib directory (defaults to /HOME/lib)])], -# [CCOLAMDLib=$withval], -# [CCOLAMDLib=${HOME}/lib]) -#AC_SUBST([CCOLAMDLib]) - AC_CONFIG_FILES([CppUnitLite/Makefile \ gtsam/3rdparty/Eigen/src/Cholesky/Makefile \ gtsam/3rdparty/Eigen/src/Core/Makefile \ diff --git a/gtsam/base/Makefile.am b/gtsam/base/Makefile.am index a32aef4d1..a17ea532f 100644 --- a/gtsam/base/Makefile.am +++ b/gtsam/base/Makefile.am @@ -64,7 +64,7 @@ AM_LDFLAGS = $(BOOST_LDFLAGS) TESTS = $(check_PROGRAMS) AM_DEFAULT_SOURCE_EXT = .cpp AM_LDFLAGS += $(boost_serialization) -LDADD = libbase.la ../../CppUnitLite/libCppUnitLite.a ../3rdparty/ccolamd/libccolamd.la +LDADD = libbase.la ../../CppUnitLite/libCppUnitLite.a # rule to run an executable %.run: % $(LDADD)