From ae98bb72fef8a4b92e4f23b890a58a4f2efae296 Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Tue, 16 Mar 2010 12:51:05 +0000 Subject: [PATCH] Added define for CBLAS to the mac version so that blas functions are actually used --- cpp/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/Makefile.am b/cpp/Makefile.am index c82d652dd..b769ad7c3 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -293,7 +293,7 @@ include_HEADERS = $(headers) AM_CXXFLAGS += -I.. AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite $(BOOST_LDFLAGS) $(boost_serialization) #-L. -lgtsam -# adding cblas implementation with atlas +# adding cblas implementation if USE_BLAS_LINUX AM_CXXFLAGS += -DCBLAS libgtsam_la_CPPFLAGS += -DCBLAS @@ -302,8 +302,8 @@ libgtsam_la_LDFLAGS += $(BLAS_LIBS) $(LIBS) $(FLIBS) # -lcblas -latlas 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_CXXFLAGS += -DCBLAS -DYA_BLAS -DYA_LAPACK -DYA_BLASMULT -I/System/Library/Frameworks/vecLib.framework/Headers +libgtsam_la_CPPFLAGS += -DCBLAS -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