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

added USE_BLAS_MACOS and changed old USE_BLAS to USE_BLAS_LINUX to make ublas compilable on mac

release/4.3a0
Kai Ni 2010-03-15 20:10:36 +00:00
parent 942893ebca
commit 5b86f2777b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -63,7 +63,8 @@ AC_ARG_ENABLE([blas],
*) AC_MSG_ERROR([bad value ${enableval} for --enable-blas]) ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-blas]) ;;
esac],[blas=false]) esac],[blas=false])
AM_CONDITIONAL([USE_BLAS], [test x$blas = xtrue]) AM_CONDITIONAL([USE_BLAS_MACOS], [test x$blas = xtrue && test -f "/System/Library/Frameworks/vecLib.framework/Headers/cblas.h"])
AM_CONDITIONAL([USE_BLAS_LINUX], [test x$blas = xtrue && USE_BLAS_MAC = false])
# Checks for programs. # Checks for programs.
AC_PROG_CXX AC_PROG_CXX

9
cpp/Makefile.am
View File

@ -294,13 +294,20 @@ AM_CXXFLAGS += -I..
AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite $(BOOST_LDFLAGS) $(boost_serialization) #-L. -lgtsam AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite $(BOOST_LDFLAGS) $(boost_serialization) #-L. -lgtsam
# adding cblas implementation with atlas # adding cblas implementation with atlas
if USE_BLAS if USE_BLAS_LINUX
AM_CXXFLAGS += -DCBLAS AM_CXXFLAGS += -DCBLAS
libgtsam_la_CPPFLAGS += -DCBLAS libgtsam_la_CPPFLAGS += -DCBLAS
AM_LDFLAGS += $(BLAS_LIBS) $(LIBS) $(FLIBS) # -lcblas -latlas AM_LDFLAGS += $(BLAS_LIBS) $(LIBS) $(FLIBS) # -lcblas -latlas
libgtsam_la_LDFLAGS += $(BLAS_LIBS) $(LIBS) $(FLIBS) # -lcblas -latlas libgtsam_la_LDFLAGS += $(BLAS_LIBS) $(LIBS) $(FLIBS) # -lcblas -latlas
endif endif
if USE_BLAS_MACOS
AM_CXXFLAGS += -DYA_BLAS -DYA_LAPACK -DYA_BLASMULT -I/System/Library/Frameworks/vecLib.framework/Headers
libgtsam_la_CPPFLAGS += -DYA_BLAS -DYA_LAPACK -DYA_BLASMULT -I/System/Library/Frameworks/vecLib.framework/Headers
AM_LDFLAGS += -lcblas -latlas
libgtsam_la_LDFLAGS += -framework vecLib -lcblas -latlas
endif
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
CXXLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ CXXLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \