Skip to content

Commit 9ecb9d8

Browse files
committed
Handle prefix=NONE case in MetaPhysicL
1 parent 26725c3 commit 9ecb9d8

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

m4/libmesh_metaphysicl.m4

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ AC_DEFUN([CONFIGURE_METAPHYSICL],
124124
AS_IF([test "x$build_metaphysicl" = "xyes"],
125125
[
126126
AC_MSG_RESULT(<<< Configuring library with built-in MetaPhysicL support >>>)
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]])
127+
AS_IF([test "x$prefix" = "xNONE"],
128+
[future_timpi_prefix=$ac_abs_top_builddir/contrib/timpi/src/],
129+
[future_timpi_prefix=$prefix])
130+
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=$future_timpi_prefix],[--with-timpi-method=$my_method]])
128131
],
129132
[AC_MSG_RESULT(<<< Configuring library with external MetaPhysicL support >>>)])
130133
],

0 commit comments

Comments
 (0)