Changeset 27566

Timestamp:

02/10/23 22:17:17 (2 years ago)

Author:

jdquinn

Message:

CHG: Further fixes for macOS binaries

Location:

issm/trunk-jpl/jenkins

Files:

• mac-intel-binaries-matlab (modified) (4 diffs)
• mac-intel-binaries-python (modified) (3 diffs)

issm/trunk-jpl/jenkins/mac-intel-binaries-matlab

@@ -3 +3 @@
 #--------------------#
 
-MATLAB_PATH="/Applications/MATLAB_R2018a.app"
+MATLAB_PATH="/Applications/MATLAB_R2022b.app"
 
 # NOTE:
@@ -20 +20 @@
         --disable-dependency-tracking \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-fortran-lib="/usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libgfortran.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libquadmath.a //usr/local/Cellar/gcc/12.2.0/lib/gcc/12/gcc/x86_64-apple-darwin21/12/libgcc.a" \
+        --with-fortran-lib="/usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libgfortran.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libquadmath.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/gcc/x86_64-apple-darwin21/12/libgcc.a" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -32 +32 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
-        --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \
         --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
@@ -52 +51 @@
         dakota          install-6.2-mac-static.sh
         curl            install-7-mac-static.sh
-        hdf5            install-1-parallel-static.sh
         netcdf          install-4.7-parallel-static.sh
         proj            install-6-static.sh

issm/trunk-jpl/jenkins/mac-intel-binaries-python

@@ -20 +20 @@
         --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
         --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
-        --with-fortran-lib="/usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libgfortran.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libquadmath.a //usr/local/Cellar/gcc/12.2.0/lib/gcc/12/gcc/x86_64-apple-darwin21/12/libgcc.a" \
+        --with-fortran-lib="/usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libgfortran.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libquadmath.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/gcc/x86_64-apple-darwin21/12/libgcc.a" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -32 +32 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
-        --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \
         --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
@@ -52 +51 @@
         dakota          install-6.2-mac-static.sh
         curl            install-7-mac-static.sh
-        hdf5            install-1-parallel-static.sh
         netcdf          install-4.7-parallel-static.sh
         proj            install-6-static.sh