Changeset 25662

Timestamp:

10/08/20 17:54:25 (4 years ago)

Author:

jdquinn

Message:

BUG: Need to add fmemopen conditional again as build fails to compile on Pine Island otherwise

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -204 +204 @@
         AM_CONDITIONAL([MAC], [test "${IS_MAC}" == "yes"])
         AC_MSG_RESULT([${IS_MAC}])
+
+        dnl If macOS, check if system copy of libc has fmemopen (if it is not 
+        dnl macOS, we do not check, but still must set SYSTEM_HAS_FMEMOPEN)
+        SYSTEM_FMEMOPEN="no"
+        if test "${IS_MAC}" == "yes"; then
+                AC_MSG_CHECKING([if system libc has fmemopen])
+                if [[ $(system_profiler SPSoftwareDataType | $(which grep) "System Version:" | sed -e "s/[[:space:]]*System Version: macOS //" | cut -d "." -f 2) -ge 13 ]]; then
+                        SYSTEM_FMEMOPEN="yes"
+                fi
+        fi
+        AM_CONDITIONAL([SYSTEM_HAS_FMEMOPEN], [test "${SYSTEM_FMEMOPEN}" == "yes"])
+        AC_MSG_RESULT([${SYSTEM_FMEMOPEN}])
 
         IS_WINDOWS=no

issm/trunk-jpl/src/c/Makefile.am

@@ -353 +353 @@
         ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp \
         ./modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp \
-        ./modules/QmuStatisticsx/QmuStatisticsx.cpp  \
         ./cores/dakota_core.cpp
+        if SYSTEM_FMEMOPEN
+                issm_sources += ./modules/QmuStatisticsx/QmuStatisticsx.cpp
+        fi
 endif
 #}}}