Changeset 27706

Timestamp:

04/24/23 20:04:29 (2 years ago)

Author:

jdquinn

Message:

CHG: Issues with Dakota on Intel-based Mac node

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/dakota/install-6.2-mac.sh (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh ¶

@@ -484 +484 @@
 if [ -d "${GSL_ROOT}" ]; then
         export GSL_HOME="${GSL_ROOT}" # Used in installation of Dakota
+        cpath_prepend "${GSL_ROOT}/include"
         ld_library_path_append "${GSL_ROOT}/lib"
 fi

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

@@ -24 +24 @@
 export DAK_INSTALL=${PREFIX} # DO NOT CHANGE THIS
 export DAK_SRC=${ISSM_DIR}/externalpackages/dakota/src # DO NOT CHANGE THIS
-export GSL_CONFIG=${GSL_HOME}/bin/gsl-config
 export LAPACK_LIBS="-L${LAPACK_ROOT}/lib -lflapack -L${LIBGFORTRAN_ROOT} -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export LDFLAGS="-framework CoreFoundation"
@@ -58 +57 @@
 # 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
+
+echo "Debug:"
+echo "GSL_HOME : ${GSL_HOME}"
+echo "CPATH : ${CPATH}"
 
 # Configure