From 2f9c8544a18ca864df2707c4e6cd8f84597b75d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Thu, 29 Jul 2021 11:05:03 +0200 Subject: [PATCH] detects version independent macos updated macos.platform (adds security policy, shortens instructions) --- candi.sh | 25 +++++++++++------- .../platforms/supported/macos.platform | 26 +++++++++++++++++++ 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 deal.II-toolchain/platforms/supported/macos.platform diff --git a/candi.sh b/candi.sh index c508cc8..d032851 100755 --- 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 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 . +## -- 2.39.5