Changeset 27997

Timestamp:

11/03/23 20:16:52 (17 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/msmpi/install-static.sh (modified) (1 diff)
• jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab (modified) (1 diff)

issm/trunk-jpl/externalpackages/msmpi/install-static.sh ¶

@@ -64 +64 @@
 # Copy MS-MPI license files to 'license' directory
 cp -R ${MSMPI_LIC_DIR}/* ${PREFIX}/license
+
+# TODO: Remove all of the following once compilation of a newer version of 
+#               PETSc that does not pick up system DLL is sorted out
+#
+
+# Copy MS-MPI library to 'lib' directory
+cp ${MSMPI_LIB} ${PREFIX}/lib
+
+# Create link to shared library so that libtool can find it
+cd ${PREFIX}/lib
+ln -s msmpi.dll libmsmpi.dll
+

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.sh
+        msmpi           install-static.sh
         petsc           install-3.14-win-msys2-mingw-msmpi-static.sh
         triangle        install-win-msys2-mingw-static.sh