# HG changeset patch # User Eugenio Gianniti # Date 1406646719 -7200 # Node ID 7f33554e439a3223d3f9f2ab39776a591b3b8fb7 # Parent b1dc980506344ca4a31cab455ad2e23a58e28c83 Add preprocessor define to support compatibility with DOLFIN 1.4.0 and 1.3.0 diff -r b1dc98050634 -r 7f33554e439a src/Makefile.in --- a/src/Makefile.in Sun Jul 20 18:59:17 2014 +0200 +++ b/src/Makefile.in Tue Jul 29 17:11:59 2014 +0200 @@ -18,9 +18,15 @@ FFC ?= ffc ARFLAGS=-r -s -CPPFLAGS='@DENSE_CPPFLAGS@ @DOLFIN_CPPFLAGS@ @EIGEN_CPPFLAGS@ -I.' +DOLFIN_CPPFLAGS=@DOLFIN_CPPFLAGS@ +CPPFLAGS=@DENSE_CPPFLAGS@ @EIGEN_CPPFLAGS@ -I. LIBS_RAW=@EIGEN_LIBS@ @DOLFIN_LIBS@ LIBS=$(patsubst %, "%", $(LIBS_RAW)) +ifeq (1.4.0, $(findstring 1.4.0, $(DOLFIN_CPPFLAGS))) + CPPFLAGS+=-DLATEST_DOLFIN +endif +CPPFLAGS+=$(DOLFIN_CPPFLAGS) +CPPFLAGS:='$(CPPFLAGS)' OCTFILES= Mesh.oct \ DirichletBC.oct \