From e352780c7b2ce198e22ec261a6e28faebd140b4d Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Sun, 6 May 2018 09:50:09 +0200 Subject: [PATCH] Move parsing of external.conf at the end. --- cmake/cpack-mac-bundle/dealii.conf.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 -- 2.39.5