Changeset 27232 for issm/trunk/externalpackages/dakota/install-6.2-mac.sh

Timestamp:

08/25/22 16:50:29 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27230

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• externalpackages/dakota/install-6.2-mac.sh (modified) (4 diffs)

issm/trunk/externalpackages/dakota/install-6.2-mac.sh

@@ -9 +9 @@
 PREFIX="${ISSM_DIR}/externalpackages/dakota/install" # Set to location where external package should be installed
 
-## Environment
-#
-
 # Find libgfortran so that we do not have to hardcode it.
 #
@@ -20 +17 @@
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | grep -n libgfortran.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 
+## Environment
+#
 export BLAS_LIBS="-L${BLAS_ROOT}/lib -lfblas -L${LIBGFORTRAN_ROOT} -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export DAK_BUILD=${ISSM_DIR}/externalpackages/dakota/build # DO NOT CHANGE THIS
@@ -57 +56 @@
 cp configs/${VER}/mac/cmake/InstallDarwinDylibs.cmake ${DAK_SRC}/cmake
 
+# Disable requirement of Python 2 for TriBITS
+sed -i'' -e 's|SET(PythonInterp_FIND_VERSION|#SET(PythonInterp_FIND_VERSION|' ${DAK_SRC}/packages/teuchos/cmake/tribits/package_arch/TribitsFindPythonInterp.cmake
+
 # Configure
 cd ${DAK_BUILD}
@@ -65 +67 @@
         -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
         -DCMAKE_CXX_FLAGS="-fdelayed-template-parsing" \
+        -DCMAKE_CXX_STANDARD="11" \
         -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
-        -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \
         -DBoost_NO_BOOST_CMAKE=TRUE \
         -DHAVE_ACRO=OFF \