From 21fb9f7923538775b9657bcad2de2780953d4e94 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@dune-project.org>
Date: Fri, 10 Jun 2005 08:31:31 +0000
Subject: [PATCH] builds parallel UGGrid again
[[Imported from SVN: r2127]]
---
grid/uggrid/Makefile.am | 4 ++--
io/file/amiramesh/Makefile.am | 4 ++--
m4/ug.m4 | 7 ++++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/grid/uggrid/Makefile.am b/grid/uggrid/Makefile.am
index 709460ae6..63b4b068b 100644
--- a/grid/uggrid/Makefile.am
+++ b/grid/uggrid/Makefile.am
@@ -6,11 +6,11 @@ noinst_LTLIBRARIES = libuggrid2.la libuggrid3.la
# The two libs are compiled from the same source, but with different options
libuggrid2_la_SOURCES = uggrid.cc
-libuggrid2_la_CXXFLAGS = $(AM_CPPFLAGS) -I$(UG_INCLUDE_PATH) -D_2
+libuggrid2_la_CXXFLAGS = $(AM_CPPFLAGS) $(UG_NODIM_CPPFLAGS) -D_2
libuggrid2_la_LIBADD = $(UG_LDFLAGS) $(UG_LIBS2)
libuggrid3_la_SOURCES = uggrid.cc
-libuggrid3_la_CXXFLAGS = $(AM_CPPFLAGS) -I$(UG_INCLUDE_PATH) -D_3
+libuggrid3_la_CXXFLAGS = $(AM_CPPFLAGS) $(UG_NODIM_CPPFLAGS) -D_3
libuggrid3_la_LIBADD = $(UG_LDFLAGS) $(UG_LIBS3)
endif
diff --git a/io/file/amiramesh/Makefile.am b/io/file/amiramesh/Makefile.am
index 1ed114f87..600607553 100644
--- a/io/file/amiramesh/Makefile.am
+++ b/io/file/amiramesh/Makefile.am
@@ -6,11 +6,11 @@ if UG
noinst_LTLIBRARIES = libug2amiramesh.la libug3amiramesh.la
libug2amiramesh_la_SOURCES = amuggridreader.cc
-libug2amiramesh_la_CXXFLAGS = $(AMIRAMESH_CPPFLAGS) -I$(UG_INCLUDE_PATH) -D_2
+libug2amiramesh_la_CXXFLAGS = $(AMIRAMESH_CPPFLAGS) $(UG_NODIM_CPPFLAGS) -D_2
libug2amiramesh_la_LIBADD = $(AMIRAMESH_LDFLAGS)
libug3amiramesh_la_SOURCES = amuggridreader.cc
-libug3amiramesh_la_CXXFLAGS = $(AMIRAMESH_CPPFLAGS) -I$(UG_INCLUDE_PATH) -D_3
+libug3amiramesh_la_CXXFLAGS = $(AMIRAMESH_CPPFLAGS) $(UG_NODIM_CPPFLAGS) -D_3
libug3amiramesh_la_LIBADD = $(AMIRAMESH_LDFLAGS)
diff --git a/m4/ug.m4 b/m4/ug.m4
index 628f34bb8..066fcef41 100644
--- a/m4/ug.m4
+++ b/m4/ug.m4
@@ -96,11 +96,15 @@ AC_DEFUN([DUNE_PATH_UG],[
# UG_CPPFLAGS="-D_${UGDOMAIN}_ -D_${UG_DIM} $UG_CPPFLAGS"
# fi
+
+
# use global dimension
if test "$with_problem_dim" != "$with_world_dim" ; then
AC_MSG_ERROR([problem-dimension and world-dimension have to be the same for UG!])
fi
UG_DIM="$with_problem_dim"
+ # The same as UG_CPPFLAGS, but without the dimensionality parameter
+ UG_NODIM_CPPFLAGS="${UG_CPPFLAGS}"
UG_CPPFLAGS="${UG_CPPFLAGS} -D_${UG_DIM}"
AC_LANG_PUSH([C++])
@@ -135,6 +139,7 @@ AC_DEFUN([DUNE_PATH_UG],[
[int i = UG${UG_DIM}d::InitUg(0,0)],
[UG_LDFLAGS="$LDFLAGS"
UG_CPPFLAGS="$UG_CPPFLAGS -DModelP"
+ UG_NODIM_CPPFLAGS="$UG_NODIM_CPPFLAGS -DModelP"
HAVE_UG="1"
AC_MSG_RESULT(yes)
],
@@ -161,7 +166,7 @@ AC_DEFUN([DUNE_PATH_UG],[
# TODO: Not working for the parallel UG
AC_SUBST(UG_LIBS3, "-lug3 -ldomS3 -lgg3 -ldevS")
AC_SUBST(UG_CPPFLAGS, $UG_CPPFLAGS)
- AC_SUBST(UG_INCLUDE_PATH, $UG_INCLUDE_PATH)
+ AC_SUBST(UG_NODIM_CPPFLAGS, $UG_NODIM_CPPFLAGS)
AC_DEFINE(HAVE_UG, 1, [Define to 1 if UG is found])
# add to global list
--
GitLab