From cb11dea1904fd0a2ba0dba5bc71de5d703444a82 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 29 Dec 2019 16:26:29 -0500 Subject: [PATCH] OSX 10.14 and 10.15 support - add platform detection - update homebrew instructions --- candi.sh | 2 + .../platforms/supported/catalina.platform | 38 +++++++++++++++++++ .../platforms/supported/mojave.platform | 38 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 deal.II-toolchain/platforms/supported/catalina.platform create mode 100644 deal.II-toolchain/platforms/supported/mojave.platform diff --git a/candi.sh b/candi.sh index 2d50de6..9794c20 100755 --- a/candi.sh +++ b/candi.sh @@ -565,6 +565,8 @@ guess_platform() { 10.11*) echo elcapitan;; 10.12*) echo sierra;; 10.13*) echo highsierra;; + 10.14*) echo mojave;; + 10.15*) echo catalina;; esac elif [ ! -z "$CRAYOS_VERSION" ]; then diff --git a/deal.II-toolchain/platforms/supported/catalina.platform b/deal.II-toolchain/platforms/supported/catalina.platform new file mode 100644 index 0000000..a2bb36d --- /dev/null +++ b/deal.II-toolchain/platforms/supported/catalina.platform @@ -0,0 +1,38 @@ +# macOS 10.15 (Catalina) +# +# 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/mojave.platform b/deal.II-toolchain/platforms/supported/mojave.platform new file mode 100644 index 0000000..7163969 --- /dev/null +++ b/deal.II-toolchain/platforms/supported/mojave.platform @@ -0,0 +1,38 @@ +# macOS 10.14 (Mojave) +# +# 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. +# +## -- 2.39.5