platform macOS updates: unifies plaform naming scheme, adds big sur

diff --git a/README.md b/README.md
index 7c41d7f3d7fa527a18214339adfd07ba5f55c289..b0ed3a10d2a4619f05dcdcc41c251f3cf0bb6d3c 100644 (file)
--- 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 f1350e3f7c52b133b5f7b3bc201445d22d150830..1b5ab266b32c3837709d28114cf2deff403975ef 100755 (executable)
--- 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 (file)
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