From: Luca Heltai Date: Sun, 6 May 2018 07:50:09 +0000 (+0200) Subject: Move parsing of external.conf at the end. X-Git-Tag: v9.1.0-rc1~1204^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73550a00606cb7171c4378e6f7971625f73bcc3e;p=dealii.git Move parsing of external.conf at the end. --- diff --git a/cmake/cpack-mac-bundle/dealii.conf.in b/cmake/cpack-mac-bundle/dealii.conf.in index 52f1606e3c..d4361142bc 100644 --- a/cmake/cpack-mac-bundle/dealii.conf.in +++ b/cmake/cpack-mac-bundle/dealii.conf.in @@ -34,10 +34,6 @@ fi export PATH=$DEAL_II_RESOURCES/bin:$PATH export DEAL_II_DIR=$DEAL_II_RESOURCES -# Do whatever the external library tells us to -if [ -f $DEAL_II_RESOURCES/@DEAL_II_CPACK_EXTERNAL_LIBS@/external.conf ]; then - . $DEAL_II_RESOURCES/@DEAL_II_CPACK_EXTERNAL_LIBS@/external.conf -fi if [ -z "$DEAL_II_CONF_SILENT" ]; then # Clear screen @@ -86,3 +82,8 @@ if ! [[ -x /usr/bin/xcodebuild ]]; then EOF fi + +# Lastly, do whatever the external library installation tells us to +if [ -f $DEAL_II_RESOURCES/@DEAL_II_CPACK_EXTERNAL_LIBS@/external.conf ]; then + . $DEAL_II_RESOURCES/@DEAL_II_CPACK_EXTERNAL_LIBS@/external.conf +fi