detects version independent macos

updated macos.platform (adds security policy, shortens instructions)

diff --git a/candi.sh b/candi.sh
index c508cc83c453e67d900deacc99dc648679953ae2..d032851fc1c0d67eeef360a5e9b759fd41cb9484 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -600,16 +600,23 @@ guess_platform() {
         echo cygwin
 
     elif [ -x /usr/bin/sw_vers ]; then
+        local MACOS_PRODUCT_NAME=$(sw_vers -productName)
         local MACOS_VERSION=$(sw_vers -productVersion)
-        case ${MACOS_VERSION} in
-            10.11*) echo macos_elcapitan;;
-            10.12*) echo macos_sierra;;
-            10.13*) echo macos_highsierra;;
-            10.14*) echo macos_mojave;;
-            10.15*) echo macos_catalina;;
-            11.4*)  echo macos_bigsur;;
-            11.5*)  echo macos_bigsur;;
-        esac
+
+        if [ "${MACOS_PRODUCT_NAME}" == "macOS" ]; then
+            echo macos
+
+        else
+            case ${MACOS_VERSION} in
+                10.11*) echo macos_elcapitan;;
+                10.12*) echo macos_sierra;;
+                10.13*) echo macos_highsierra;;
+                10.14*) echo macos_mojave;;
+                10.15*) echo macos_catalina;;
+                11.4*)  echo macos_bigsur;;
+                11.5*)  echo macos_bigsur;;
+            esac
+        fi
 
     elif [ ! -z "${CRAYOS_VERSION}" ]; then
         echo cray

diff --git a/deal.II-toolchain/platforms/supported/macos.platform b/deal.II-toolchain/platforms/supported/macos.platform
new file mode 100644 (file)
index 0000000..2ba2cb6
--- /dev/null
+++ b/deal.II-toolchain/platforms/supported/macos.platform
@@ -0,0 +1,26 @@
+# macOS
+#
+# Detailed Installation Notes:
+# - Install Xcode from AppStore, open it and accept the license.
+# - Open Terminal, and install Xcode command line tools via
+# $  xcode-select --install
+# and then run
+# $  xcodebuild -license
+# and accept the license.
+#
+# - Install Homebrew in a Terminal via
+# $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+#
+# - Install the following via Homebrew
+# $  brew install cmake gcc@11 openmpi
+#
+# - Export compiler environment
+# $ export CC=mpicc; export CXX=mpicxx; export FC=mpifort; export FF=mpifort; \
+# OMPI_CC=gcc-11; export OMPI_CXX=g++-11; export OMPI_FC=gfortran-11
+#
+# Run candi again!
+#
+# If you encounter runtime problems with missing *.dylib libraries,
+# you may change the security policy for developments. To do so,
+# enable Terminal in System Preferences / Security & Privacy / Developer Tools .
+##