Moved smallExample to slam, as used in some project unit tests as well. [tests] no longer builds a local library as a consequence.

release/4.3a0
Frank Dellaert 2010-07-13 05:26:19 +00:00
parent 3c8d243bec
commit 559eaf8cc1
7 changed files with 14 additions and 12 deletions

View File

@ -732,6 +732,14 @@
<useDefaultCommand>false</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>clean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="all" path="nonlinear" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>

View File

@ -10,7 +10,7 @@ check_PROGRAMS =
headers += Simulated2DConfig.h
headers += Simulated2DPosePrior.h Simulated2DPointPrior.h
headers += Simulated2DOdometry.h Simulated2DMeasurement.h
sources += simulated2D.cpp
sources += simulated2D.cpp smallExample.cpp
check_PROGRAMS += testSimulated2D
# simulated2DOriented example
@ -46,6 +46,7 @@ check_PROGRAMS += testVSLAMFactor testVSLAMGraph testVSLAMConfig
# GaussianISAM2 is fairly SLAM-specific
sources += GaussianISAM2.cpp
check_PROGRAMS += testGaussianISAM2
#----------------------------------------------------------------------------------------------------
# Create a libtool library that is not installed

BIN
slam/testGaussianISAM2 Executable file

Binary file not shown.

View File

@ -5,7 +5,7 @@
check_PROGRAMS = testBayesNetPreconditioner testConstraintOptimizer
check_PROGRAMS += testGaussianBayesNet testGaussianFactor testGaussianFactorGraph
check_PROGRAMS += testGaussianISAM testGaussianISAM2 testGraph
check_PROGRAMS += testGaussianISAM testGraph
check_PROGRAMS += testInference testIterative testGaussianJunctionTree
check_PROGRAMS += testNonlinearEquality testNonlinearFactor testNonlinearFactorGraph
check_PROGRAMS += testNonlinearOptimizer testSQP testSubgraphPreconditioner
@ -14,21 +14,14 @@ check_PROGRAMS += testSymbolicBayesNet testSymbolicFactorGraph testTupleConfig
# Timing tests
noinst_PROGRAMS = timeGaussianFactorGraph
#----------------------------------------------------------------------------------------------------
# rules to build local library
#----------------------------------------------------------------------------------------------------
noinst_HEADERS = smallExample.h
noinst_LIBRARIES = libtests.a
libtests_a_SOURCES = smallExample.cpp
AM_CPPFLAGS = -I$(boost) -I../colamd
AM_CPPFLAGS += -I../base -I../geometry -I../inference -I../linear -I../nonlinear -I../slam
#----------------------------------------------------------------------------------------------------
# rules to build unit tests
#----------------------------------------------------------------------------------------------------
TESTS = $(check_PROGRAMS)
AM_CPPFLAGS = -I$(boost) -I../colamd
AM_CPPFLAGS += -I../base -I../geometry -I../inference -I../linear -I../nonlinear -I../slam
AM_LDFLAGS = $(BOOST_LDFLAGS) $(boost_serialization)
LDADD = libtests.a ../libgtsam.la ../CppUnitLite/libCppUnitLite.a
LDADD = ../libgtsam.la ../CppUnitLite/libCppUnitLite.a
AM_DEFAULT_SOURCE_EXT = .cpp
# rule to run an executable