From e9c634539a6807f2b8b63ded9a945afcf2749c83 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20K=C3=B6cher?= <mail@uwe.koecher.cc>
Date: Tue, 29 Jun 2021 10:56:44 +0200
Subject: [PATCH] platform macOS updates: unifies plaform naming scheme, adds
 big sur

---
 README.md                                     |  3 +-
 candi.sh                                      | 11 +++---
 .../platforms/supported/macos_bigsur.platform | 38 +++++++++++++++++++
 ...alina.platform => macos_catalina.platform} |  0
 ...itan.platform => macos_elcapitan.platform} |  0
 ...rra.platform => macos_highsierra.platform} |  0
 ...{sierra.platform => macos_sierra.platform} |  0
 7 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 deal.II-toolchain/platforms/supported/macos_bigsur.platform
 rename deal.II-toolchain/platforms/supported/{catalina.platform => macos_catalina.platform} (100%)
 rename deal.II-toolchain/platforms/supported/{elcapitan.platform => macos_elcapitan.platform} (100%)
 rename deal.II-toolchain/platforms/supported/{highsierra.platform => macos_highsierra.platform} (100%)
 rename deal.II-toolchain/platforms/supported/{sierra.platform => macos_sierra.platform} (100%)

diff --git a/README.md b/README.md
index 7c41d7f..b0ed3a1 100644
--- a/README.md
+++ b/README.md
@@ -36,11 +36,10 @@ Follow the instructions on the screen
   ./candi.sh
 ```
 
-#### Install deal.II on macOS (10.11), 10.12, 10.13:
+#### Install deal.II on macOS (experimental):
 ```bash
   ./candi.sh
 ```
-Note: macOS support is currently experimental.
 
 #### Install deal.II on Windows 10 (1709):
 Since the Creators Update in fall 2017 (Windows 10 (1709)) the
diff --git a/candi.sh b/candi.sh
index f1350e3..1b5ab26 100755
--- a/candi.sh
+++ b/candi.sh
@@ -601,11 +601,12 @@ guess_platform() {
     elif [ -x /usr/bin/sw_vers ]; then
         local MACOSVER=$(sw_vers -productVersion)
         case ${MACOSVER} in
-            10.11*)  echo elcapitan;;
-            10.12*)  echo sierra;;
-            10.13*)  echo highsierra;;
-            10.14*)  echo mojave;;
-            10.15*)  echo catalina;;
+            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;;
         esac
 
     elif [ ! -z "$CRAYOS_VERSION" ]; then
diff --git a/deal.II-toolchain/platforms/supported/macos_bigsur.platform b/deal.II-toolchain/platforms/supported/macos_bigsur.platform
new file mode 100644
index 0000000..b4c4116
--- /dev/null
+++ b/deal.II-toolchain/platforms/supported/macos_bigsur.platform
@@ -0,0 +1,38 @@
+# macOS Big Sur (11.4)
+#
+# macOS support is experimental and requires:
+# - a recent version of xcode with command line tools
+# - openmpi installed using homebrew and
+# - cmake
+#
+# 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
+# to accept the license.
+#
+# Install Homebrew in a Terminal via
+# $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+#
+# Install the following via Homebrew
+# $ brew install cmake
+# $ brew install openmpi
+#
+# Put the following definitions into your bashrc to use gcc (instead of apple clang):
+#   export OMPI_CXX=g++-9
+#   export OMPI_CC=gcc-9
+#   export OMPI_FC=gfortran-9
+#
+# (Optional) Install the following via Homebrew
+# $ brew install wget
+# $ brew install gnuplot
+#
+# $ brew install bash
+# and follow the shell activation notes.
+#
+# $ brew install modules
+# and follow the activation notes to use the modulefile configuration.
+#
+##
diff --git a/deal.II-toolchain/platforms/supported/catalina.platform b/deal.II-toolchain/platforms/supported/macos_catalina.platform
similarity index 100%
rename from deal.II-toolchain/platforms/supported/catalina.platform
rename to deal.II-toolchain/platforms/supported/macos_catalina.platform
diff --git a/deal.II-toolchain/platforms/supported/elcapitan.platform b/deal.II-toolchain/platforms/supported/macos_elcapitan.platform
similarity index 100%
rename from deal.II-toolchain/platforms/supported/elcapitan.platform
rename to deal.II-toolchain/platforms/supported/macos_elcapitan.platform
diff --git a/deal.II-toolchain/platforms/supported/highsierra.platform b/deal.II-toolchain/platforms/supported/macos_highsierra.platform
similarity index 100%
rename from deal.II-toolchain/platforms/supported/highsierra.platform
rename to deal.II-toolchain/platforms/supported/macos_highsierra.platform
diff --git a/deal.II-toolchain/platforms/supported/sierra.platform b/deal.II-toolchain/platforms/supported/macos_sierra.platform
similarity index 100%
rename from deal.II-toolchain/platforms/supported/sierra.platform
rename to deal.II-toolchain/platforms/supported/macos_sierra.platform
-- 
2.39.5