Skip to content

Commit a3139f9

Browse files
committed
Use future TIMPI dir for MetaPhysicL
1 parent 347fff0 commit a3139f9

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

m4/libmesh_metaphysicl.m4

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,10 @@ AC_DEFUN([CONFIGURE_METAPHYSICL],
121121
dnl here's a trick from GraphicsMagick:
122122
my_top_srcdir="$(cd $srcdir && pwd)"
123123
124-
dnl FIXME: setting TIMPI_DIR, even to something invalid, is
125-
dnl currently the best way to get MetaPhysicL to recognize
126-
dnl that we really want TIMPI.
127-
128124
AS_IF([test "x$build_metaphysicl" = "xyes"],
129125
[
130126
AC_MSG_RESULT(<<< Configuring library with built-in MetaPhysicL support >>>)
131-
AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[TIMPI_DIR=$my_top_srcdir/contrib/timpi/],[--with-timpi-method=$my_method]])
127+
AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[--with-future-timpi-dir=$prefix],[--with-timpi-method=$my_method]])
132128
],
133129
[AC_MSG_RESULT(<<< Configuring library with external MetaPhysicL support >>>)])
134130
],

0 commit comments

Comments
 (0)