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

Changed order of compiler include paths to prevent conflict with MacPorts lapack

release/4.3a0
Richard Roberts 2010-11-02 22:59:43 +00:00
parent 2b9193e12a
commit c2864f5f61
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtsam/base/Makefile.am
View File

@ -50,18 +50,20 @@ base_HEADERS = $(headers)
noinst_LTLIBRARIES = libbase.la noinst_LTLIBRARIES = libbase.la
libbase_la_SOURCES = $(sources) libbase_la_SOURCES = $(sources)
AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) AM_CPPFLAGS =
AM_LDFLAGS = $(BOOST_LDFLAGS)
if USE_BLAS
AM_CPPFLAGS += -DGT_USE_CBLAS
endif
# On Mac, we compile using the BLAS/LAPACK headers in the Accelerate framework # On Mac, we compile using the BLAS/LAPACK headers in the Accelerate framework
if USE_ACCELERATE_MACOS if USE_ACCELERATE_MACOS
AM_CPPFLAGS += -I/System/Library/Frameworks/vecLib.framework/Headers AM_CPPFLAGS += -I/System/Library/Frameworks/vecLib.framework/Headers
endif endif
AM_CPPFLAGS += $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)
AM_LDFLAGS = $(BOOST_LDFLAGS)
if USE_BLAS
AM_CPPFLAGS += -DGT_USE_CBLAS
endif
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# rules to build local programs # rules to build local programs
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------