Mercurial > fem-fenics-eugenio

changeset 252:7f33554e439a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add preprocessor define to support compatibility with DOLFIN 1.4.0 and 1.3.0
author Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
date Tue, 29 Jul 2014 17:11:59 +0200
parents b1dc98050634
children 5e9b5bbdc56b
files src/Makefile.in
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 \