Changeset 27944 for issm/trunk-jpl/externalpackages/msmpi/install.sh

Timestamp:

10/06/23 17:15:51 (18 months ago)

Author:

jdquinn

Message:

CHG: Support for MATLAB binaries on Windows

File:

• issm/trunk-jpl/externalpackages/msmpi/install.sh (modified) (1 diff)

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

@@ -34 +34 @@
 PREFIX="${ISSM_DIR}/externalpackages/msmpi/install"
 
+MSMPI_BIN_DIR=$(cygpath -u $(cygpath -ms "/c/Program Files/Microsoft MPI/Bin"))
+MSMPI_INC_DIR=$(cygpath -u $(cygpath -ms "/c/Program Files (x86)/Microsoft SDKs/MPI/Include"))
 MSMPI_LIB="/c/Windows/System32/msmpi.dll"
-MSMPI_INC=$(cygpath -u $(cygpath -ms "/c/Program Files (x86)/Microsoft SDKs/MPI/Include"))
 
 # Cleanup
 rm -rf ${PREFIX}
-mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib
+mkdir -p ${PREFIX} ${PREFIX}/bin ${PREFIX}/include ${PREFIX}/lib
 
 # Copy MS-MPI header files to 'include' directory
-cp ${MSMPI_INC}/mpi.h ${PREFIX}/include
-cp ${MSMPI_INC}/mpi.f90 ${PREFIX}/include
-cp ${MSMPI_INC}/mpif.h ${PREFIX}/include
-cp ${MSMPI_INC}/mpio.h ${PREFIX}/include
-cp ${MSMPI_INC}/x64/mpifptr.h ${PREFIX}/include
+cp ${MSMPI_INC_DIR}/mpi.h ${PREFIX}/include
+cp ${MSMPI_INC_DIR}/mpi.f90 ${PREFIX}/include
+cp ${MSMPI_INC_DIR}/mpif.h ${PREFIX}/include
+cp ${MSMPI_INC_DIR}/mpio.h ${PREFIX}/include
+cp ${MSMPI_INC_DIR}/x64/mpifptr.h ${PREFIX}/include
 
 # Copy MS-MPI library to 'lib' directory