Changeset 27995

Timestamp:

11/03/23 15:15:57 (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:

• externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi-static.sh (modified) (1 diff)
• jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab (modified) (1 diff)

issm/trunk-jpl/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi-static.sh

@@ -73 +73 @@
         --with-proc-filesystem=0 \
         --with-mpiexec="${MPIEXEC_DIR}/mpiexec.exe" \
-        --with-mpi-lib=["${MSMPI_ROOT}/lib/libmsmpi.a"] \
+        --with-mpi-lib=["-L${MSMPI_ROOT}/lib","-lmsmpi"] \
         --with-mpi-include=["${MSMPI_ROOT}/include"] \
         --download-fblaslapack=1 \

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

@@ -31 +31 @@
 #List of external packages to be installed and their installation scripts
 EXTERNALPACKAGES="
-        msmpi           install-static.sh
-        petsc           install-3.14-win-msys2-mingw-msmpi.sh
+        msmpi           install.sh
+        petsc           install-3.14-win-msys2-mingw-msmpi-static.sh
         triangle        install-win-msys2-mingw-static.sh
         chaco           install-win-msys2-mingw.sh