From: Timo Heister Date: Mon, 1 May 2017 15:00:22 +0000 (-0400) Subject: mac osx support X-Git-Tag: v0.8.5~20^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d9e4623eef13c46589d355f0a4d99740ab31e1;p=candi.git mac osx support --- diff --git a/candi.sh b/candi.sh index 528fb5e..5585b30 100755 --- a/candi.sh +++ b/candi.sh @@ -35,7 +35,7 @@ else DATE_CMD=$(which date) fi # Start global timer -TIC_GLOBAL="$(${DATE_CMD} +%s%N)" +TIC_GLOBAL="$(${DATE_CMD} +%s)" ################################################################################ # Parse command line input parameters @@ -551,6 +551,9 @@ guess_platform() { if [ -f /usr/bin/cygwin1.dll ]; then echo cygwin + elif [[ "$OSTYPE" == "darwin"* ]]; then + echo macosx + elif [ -f /etc/fedora-release ]; then local FEDORANAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/fedora-release` case ${FEDORANAME} in @@ -957,7 +960,7 @@ TIMINGS="" # Fetch and build individual packages for PACKAGE in ${PACKAGES[@]}; do # Start timer - TIC="$(${DATE_CMD} +%s%N)" + TIC="$(${DATE_CMD} +%s)" # Return to the original CANDI directory cd ${ORIG_DIR} @@ -1059,8 +1062,8 @@ for PACKAGE in ${PACKAGES[@]}; do package_conf # Store timing - TOC="$(($(${DATE_CMD} +%s%N)-TIC))" - TIMINGS="$TIMINGS"$"\n""$PACKAGE: ""$((TOC/1000000000)) s" + TOC="$(($(${DATE_CMD} +%s)-TIC))" + TIMINGS="$TIMINGS"$"\n""$PACKAGE: ""$((TOC)) s" done # print information about enable.sh @@ -1071,11 +1074,11 @@ cecho ${GOOD} " source ${CONFIGURATION_PATH}/enable.sh" echo # Stop global timer -TOC_GLOBAL="$(($(${DATE_CMD} +%s%N)-TIC_GLOBAL))" +TOC_GLOBAL="$(($(${DATE_CMD} +%s)-TIC_GLOBAL))" # Display a summary echo -cecho ${GOOD} "Build finished in $((TOC_GLOBAL/1000000000)) seconds." +cecho ${GOOD} "Build finished in $((TOC_GLOBAL)) seconds." echo echo "Summary of timings:" echo -e "$TIMINGS" diff --git a/deal.II-toolchain/platforms/supported/macosx.platform b/deal.II-toolchain/platforms/supported/macosx.platform new file mode 100644 index 0000000..075bb6e --- /dev/null +++ b/deal.II-toolchain/platforms/supported/macosx.platform @@ -0,0 +1,8 @@ +# Mac OSX +# +# Mac support is experimental and requires: +# - a recent version of xcode with command line tools +# - openmpi (ideally with gcc) installed using homebrew +# - cmake +# +##