Changeset 27994

Timestamp:

11/03/23 13:44:59 (18 months ago)

Author:

jdquinn

Message:

BUG: PETSc 3.14 makefiles for Windows will link to dynamic version of libmsmpi whether we like it or not

Location:

issm/trunk-jpl

Files:

• jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab (modified) (2 diffs)
• packagers/win/package-issm-win-binaries-matlab.sh (modified) (1 diff)

issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab

@@ -11 +11 @@
         --with-fortran-lib="-Wl,-L/c/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/13.2.0 -Wl,-lgfortran" \
         --with-mpi-include="${MSMPI_ROOT}/include" \
-        --with-mpi-libflags="-Wl,${MSMPI_ROOT}/lib/libmsmpi.a" \
+        --with-mpi-libdir="-Wl,-L${MSMPI_ROOT}/lib" \
+        --with-mpi-libflags="-Wl,-lmsmpi" \
         --with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
         --with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
@@ -31 +32 @@
 EXTERNALPACKAGES="
         msmpi           install-static.sh
-        petsc           install-3.14-win-msys2-mingw-msmpi-static.sh
+        petsc           install-3.14-win-msys2-mingw-msmpi.sh
         triangle        install-win-msys2-mingw-static.sh
         chaco           install-win-msys2-mingw.sh

issm/trunk-jpl/packagers/win/package-issm-win-binaries-matlab.sh

@@ -80 +80 @@
 cp /c/msys64/mingw64/bin/libquadmath-0.dll .
 
-echo "Moving MSMPI binaries to bin/"
+echo "Moving MSMPI binaries and libraries to bin/"
 if [ -f ${MSMPI_ROOT}/bin/mpiexec.exe ]; then
         cp ${MSMPI_ROOT}/bin/* .
+        cp ${MSMPI_ROOT}/lib/libmsmpi.dll .
 else
         echo "MSMPI not found"