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

Fixed include paths so that making individual unit tests works again

release/4.3a0
Richard Roberts 2010-09-11 16:54:50 +00:00
parent e5374a55e8
commit 55dedc97e3
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -35,8 +35,8 @@ libgtsam_la_LDFLAGS = -version-info 0:0:0
# Store the absolute path to the directory above gtsam for the include path, # Store the absolute path to the directory above gtsam for the include path,
# saves us from having an extra 'gtsam' subdirectory. # saves us from having an extra 'gtsam' subdirectory.
BORG_SRCROOT := $(shell cd $(top_srcdir)/.. && pwd) #BORG_SRCROOT := $(shell cd $(top_srcdir)/.. && pwd)
AM_MAKEFLAGS = "BORG_SRCROOT=$(BORG_SRCROOT)" #AM_MAKEFLAGS = "BORG_SRCROOT=$(BORG_SRCROOT)"
# Add these files to make sure they're in the distribution # Add these files to make sure they're in the distribution
noinst_HEADERS = gtsam.h noinst_HEADERS = gtsam.h

2
base/Makefile.am
View File

@ -49,7 +49,7 @@ base_HEADERS = $(headers)
noinst_LTLIBRARIES = libbase.la noinst_LTLIBRARIES = libbase.la
libbase_la_SOURCES = $(sources) libbase_la_SOURCES = $(sources)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
if USE_BLAS if USE_BLAS
AM_CPPFLAGS += -DGT_USE_CBLAS AM_CPPFLAGS += -DGT_USE_CBLAS

2
examples/Makefile.am
View File

@ -19,7 +19,7 @@ noinst_PROGRAMS += PlanarSLAMExample # Solves SLAM example from tutorial by us
# rules to build local programs # rules to build local programs
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
AM_LDFLAGS = $(BOOST_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
LDADD = ../libgtsam.la LDADD = ../libgtsam.la
AM_DEFAULT_SOURCE_EXT = .cpp AM_DEFAULT_SOURCE_EXT = .cpp
if USE_LDL if USE_LDL

2
geometry/Makefile.am
View File

@ -41,7 +41,7 @@ geometrydir = $(pkgincludedir)/geometry
geometry_HEADERS = $(headers) geometry_HEADERS = $(headers)
noinst_LTLIBRARIES = libgeometry.la noinst_LTLIBRARIES = libgeometry.la
libgeometry_la_SOURCES = $(sources) libgeometry_la_SOURCES = $(sources)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# rules to build local programs # rules to build local programs

2
inference/Makefile.am
View File

@ -58,7 +58,7 @@ inferencedir = $(pkgincludedir)/inference
inference_HEADERS = $(headers) inference_HEADERS = $(headers)
noinst_LTLIBRARIES = libinference.la noinst_LTLIBRARIES = libinference.la
libinference_la_SOURCES = $(sources) libinference_la_SOURCES = $(sources)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
AM_CXXFLAGS = AM_CXXFLAGS =
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------

2
linear/Makefile.am
View File

@ -46,7 +46,7 @@ lineardir = $(pkgincludedir)/linear
linear_HEADERS = $(headers) linear_HEADERS = $(headers)
noinst_LTLIBRARIES = liblinear.la noinst_LTLIBRARIES = liblinear.la
liblinear_la_SOURCES = $(sources) liblinear_la_SOURCES = $(sources)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
AM_CXXFLAGS = AM_CXXFLAGS =
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------

2
nonlinear/Makefile.am
View File

@ -46,7 +46,7 @@ nonlineardir = $(pkgincludedir)/nonlinear
nonlinear_HEADERS = $(headers) nonlinear_HEADERS = $(headers)
noinst_LTLIBRARIES = libnonlinear.la noinst_LTLIBRARIES = libnonlinear.la
libnonlinear_la_SOURCES = $(sources) libnonlinear_la_SOURCES = $(sources)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
AM_CXXFLAGS = AM_CXXFLAGS =
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------

2
slam/Makefile.am
View File

@ -68,7 +68,7 @@ slamdir = $(pkgincludedir)/slam
slam_HEADERS = $(headers) slam_HEADERS = $(headers)
noinst_LTLIBRARIES = libslam.la noinst_LTLIBRARIES = libslam.la
libslam_la_SOURCES = $(sources) libslam_la_SOURCES = $(sources)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# rules to build local programs # rules to build local programs

2
tests/Makefile.am
View File

@ -36,7 +36,7 @@ noinst_PROGRAMS = timeGaussianFactorGraph timeFactorOverhead
# rules to build unit tests # rules to build unit tests
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/..
AM_LDFLAGS = $(BOOST_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS)
# link to serialization library for test # link to serialization library for test

2
wrap/Makefile.am
View File

@ -18,7 +18,7 @@ noinst_HEADERS = geometry.h utilities.h Argument.h Constructor.h Method.h Class.
noinst_PROGRAMS = wrap noinst_PROGRAMS = wrap
wrap_SOURCES = ${common} wrap.cpp wrap_SOURCES = ${common} wrap.cpp
AM_CPPFLAGS = -I$(boost) -I$(BORG_SRCROOT) -DTOPSRCDIR="\"$(top_srcdir)\"" AM_CPPFLAGS = -I$(boost) -I$(top_srcdir)/.. -DTOPSRCDIR="\"$(top_srcdir)\""
AM_CXXFLAGS = -MMD AM_CXXFLAGS = -MMD
AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite $(BOOST_LDFLAGS) AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite $(BOOST_LDFLAGS)