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

Someone disabled vSLAMexample. Put it back. Also update its Makefile.am to be consistent with the new directory structure.

release/4.3a0
Duy-Nguyen Ta 2010-10-26 01:11:35 +00:00
parent 0778f37063
commit 1873cd4158
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -175,5 +175,5 @@ AC_SUBST([CCOLAMDLib])
# [LINALG_LDFLAGS="-Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate ${CCOLAMDLib}"], # [LINALG_LDFLAGS="-Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate ${CCOLAMDLib}"],
# [LINALG_LDFLAGS="-lcblas -latlas -llapack ${CCOLAMDLib}"]) # [LINALG_LDFLAGS="-lcblas -latlas -llapack ${CCOLAMDLib}"])
AC_CONFIG_FILES([CppUnitLite/Makefile gtsam/base/Makefile gtsam/geometry/Makefile gtsam/inference/Makefile gtsam/linear/Makefile gtsam/nonlinear/Makefile gtsam/slam/Makefile gtsam/Makefile tests/Makefile examples/Makefile Makefile]) AC_CONFIG_FILES([CppUnitLite/Makefile gtsam/base/Makefile gtsam/geometry/Makefile gtsam/inference/Makefile gtsam/linear/Makefile gtsam/nonlinear/Makefile gtsam/slam/Makefile gtsam/Makefile tests/Makefile examples/Makefile examples/vSLAMexample/Makefile Makefile])
AC_OUTPUT AC_OUTPUT

2
examples/Makefile.am
View File

@ -18,7 +18,7 @@ noinst_PROGRAMS += Pose2SLAMExample_easy # Solves SLAM example from tutorial
noinst_PROGRAMS += Pose2SLAMExample_advanced # Solves SLAM example from tutorial by using Pose2SLAM and advanced optimization interface noinst_PROGRAMS += Pose2SLAMExample_advanced # Solves SLAM example from tutorial by using Pose2SLAM and advanced optimization interface
noinst_PROGRAMS += Pose2SLAMwSPCG_easy # Solves a simple Pose2 SLAM example with advanced SPCG solver noinst_PROGRAMS += Pose2SLAMwSPCG_easy # Solves a simple Pose2 SLAM example with advanced SPCG solver
noinst_PROGRAMS += Pose2SLAMwSPCG_advanced # Solves a simple Pose2 SLAM example with easy SPCG solver noinst_PROGRAMS += Pose2SLAMwSPCG_advanced # Solves a simple Pose2 SLAM example with easy SPCG solver
#SUBDIRS = vSLAMexample # does not compile.... SUBDIRS = vSLAMexample # visual SLAM examples with 3D point landmarks and 6D camera poses
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# rules to build local programs # rules to build local programs
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------

4
examples/vSLAMexample/Makefile.am
View File

@ -12,16 +12,14 @@ check_PROGRAMS =
# Examples # Examples
noinst_PROGRAMS = vSFMexample noinst_PROGRAMS = vSFMexample
vSFMexample_includedir = .
vSFMexample_SOURCES = vSFMexample.cpp Feature2D.cpp vSLAMutils.cpp vSFMexample_SOURCES = vSFMexample.cpp Feature2D.cpp vSLAMutils.cpp
noinst_PROGRAMS += vISAMexample noinst_PROGRAMS += vISAMexample
vISAMexample_includedir = .
vISAMexample_SOURCES = vISAMexample.cpp Feature2D.cpp vSLAMutils.cpp vISAMexample_SOURCES = vISAMexample.cpp Feature2D.cpp vSLAMutils.cpp
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# rules to build local programs # rules to build local programs
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)
AM_LDFLAGS = $(BOOST_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS)
LDADD = ../../gtsam/libgtsam.la LDADD = ../../gtsam/libgtsam.la
AM_DEFAULT_SOURCE_EXT = .cpp AM_DEFAULT_SOURCE_EXT = .cpp