From c73537096c1c740cd09d8c1b01ac77485d040dd9 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Wed, 11 May 2016 09:16:55 -0500 Subject: [PATCH] Can't build trick 15.2.0 with --gsl=/usr The _HAVE_GSL flag was not being passed into all compilation lines when GSL was present. Added them to to CFLAGS and CXXFLAGS so it is. refs #235 --- makefiles/Makefile.common | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makefiles/Makefile.common b/makefiles/Makefile.common index 9298cad7..c74c6721 100644 --- a/makefiles/Makefile.common +++ b/makefiles/Makefile.common @@ -128,6 +128,8 @@ ifeq ($(HAVE_GSL),1) TRICK_EXEC_LINK_LIBS += -L$(GSL_HOME)/lib endif TRICK_EXEC_LINK_LIBS += -lgsl -lgslcblas + TRICK_CFLAGS += -D_HAVE_GSL + TRICK_CXXFLAGS += -D_HAVE_GSL endif TRICK_INCLUDE = $(shell $(PERL) -e '@inc_paths = "${TRICK_CFLAGS}" =~ /-I\s*(\S+)/g ; foreach $$i (@inc_paths) { print "-I$$i "}')