]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Move parsing of external.conf at the end. 6493/head
authorLuca Heltai <luca.heltai@sissa.it>
Sun, 6 May 2018 07:50:09 +0000 (09:50 +0200)
committerLuca Heltai <luca.heltai@sissa.it>
Sun, 6 May 2018 08:02:43 +0000 (10:02 +0200)
cmake/cpack-mac-bundle/dealii.conf.in

index 52f1606e3c7efec1bf2b3a11374c0df8adb70bbe..d4361142bcb831f424e030457ba97c640766c72b 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.