Use $LIBMESH_DIR in configure_libmesh.sh

idaholab · Nov 12, 2021 · 6314382 · 6314382
1 parent b349b05
commit 6314382
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/conda/libmesh/build.sh b/conda/libmesh/build.sh
@@ -74,11 +74,10 @@ fi
 
 source $SRC_DIR/configure_libmesh.sh
 export INSTALL_BINARY="${SRC_DIR}/build-aux/install-sh -C"
-METHODS="opt oprof devel dbg" configure_libmesh --prefix=${PREFIX}/libmesh \
-                                                --with-future-timpi-dir=${PREFIX}/libmesh \
-                                                --with-vtk-lib=${BUILD_PREFIX}/libmesh-vtk/lib \
-                                                --with-vtk-include=${BUILD_PREFIX}/libmesh-vtk/include/vtk-${SHORT_VTK_NAME} \
-                                                $*
+LIBMESH_DIR=${PREFIX}/libmesh METHODS="opt oprof devel dbg" \
+  configure_libmesh --with-vtk-lib=${BUILD_PREFIX}/libmesh-vtk/lib \
+                    --with-vtk-include=${BUILD_PREFIX}/libmesh-vtk/include/vtk-${SHORT_VTK_NAME} \
+                    $*
 
 make -j $CPU_COUNT
 make install

diff --git a/scripts/configure_libmesh.sh b/scripts/configure_libmesh.sh
@@ -19,11 +19,17 @@ function configure_libmesh()
     echo "SRC_DIR is not set for configure_libmesh"
     exit 1
   fi
+
   if [ ! -d "$SRC_DIR" ]; then
     echo "$SRC_DIR=SRC_DIR does not exist"
     exit 1
   fi
 
+  if [ -z "$LIBMESH_DIR" ]; then
+    echo "$LIBMESH_DIR is not set for configure_libmesh"
+    exit 1
+  fi
+
   if [ -z "$METHODS" ]; then
     echo "METHODS must be set in configure_libmesh"
     exit 1
@@ -49,6 +55,8 @@ function configure_libmesh()
                --with-cxx-std-min=2014 \
                --without-gdb-command \
                --with-methods="${METHODS}" \
+               --prefix="${LIBMESH_DIR}" \
+               --with-future-timpi-dir="${LIBMESH_DIR}" \
                INSTALL="${INSTALL_BINARY}" \
                $*
 

diff --git a/scripts/update_and_rebuild_libmesh.sh b/scripts/update_and_rebuild_libmesh.sh
@@ -163,9 +163,7 @@ if [ -z "$go_fast" ]; then
   fi
 
   source $SCRIPT_DIR/configure_libmesh.sh
-  SRC_DIR=${SCRIPT_DIR}/../libmesh configure_libmesh --prefix=$LIBMESH_DIR \
-                                                     --with-future-timpi-dir=$LIBMESH_DIR \
-                                                     $DISABLE_TIMESTAMPS \
+  SRC_DIR=${SCRIPT_DIR}/../libmesh configure_libmesh $DISABLE_TIMESTAMPS \
                                                      $VTK_OPTIONS \
                                                      $* | tee -a "$SCRIPT_DIR/$DIAGNOSTIC_LOG" || exit 1
 else