From b7fc50dd8456d3ee00a251ac25cfce07db2aca35 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20K=C3=B6cher?= <koecher@hsu-hamburg.de>
Date: Tue, 10 Nov 2015 17:55:14 +0100
Subject: [PATCH] deal.II: handle PACKAGES settings in the main candi.cfg file

---
 deal.II-toolchain/packages/dealii.package |  5 ++---
 project-deal.II-toolchain.cfg             | 10 +++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 3cdb482..8c5f978 100644
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -26,8 +26,7 @@ ${DEAL_CONFOPTS} \
 -D DEAL_II_FORCE_BUNDLED_BOOST:BOOL=OFF \
 -D DEAL_II_WITH_ZLIB:BOOL=ON \
 -D DEAL_II_WITH_FUNCTIONPARSER:BOOL=ON \
--D DEAL_II_COMPONENT_MESH_CONVERTER:BOOL=ON \
-"
+-D DEAL_II_COMPONENT_MESH_CONVERTER:BOOL=ON"
 
 ################################################################################
 # Add additional packages, if present
@@ -90,7 +89,7 @@ fi
 if [ ! -z "${OPENCASCADE_DIR}" ]; then
     CONFOPTS="\
         ${CONFOPTS} \
-        -D DEAL_II_WITH_OPENCASCADE:BOOL=ON \"
+        -D DEAL_II_WITH_OPENCASCADE:BOOL=ON"
 fi
 
 
diff --git a/project-deal.II-toolchain.cfg b/project-deal.II-toolchain.cfg
index 8dacaa4..72f611d 100644
--- a/project-deal.II-toolchain.cfg
+++ b/project-deal.II-toolchain.cfg
@@ -27,10 +27,18 @@ MIRROR="https://www.ces.clemson.edu/dealii/mirror/"
 #########################################################################
 #Choose configuration and components of deal.II
 DEAL_CONFOPTS=" \
--D DEAL_II_WITH_OPENCASCADE:BOOL=OFF \
 -D DEAL_II_COMPONENT_PARAMETER_GUI=OFF \
 "
 
+PACKAGES="load:dealii-prepare"
+#PACKAGES="${PACKAGES} once:opencascade"
+PACKAGES="${PACKAGES} once:parmetis once:superlu_dist"
+PACKAGES="${PACKAGES} once:hdf5"
+PACKAGES="${PACKAGES} once:p4est"
+PACKAGES="${PACKAGES} once:trilinos"
+PACKAGES="${PACKAGES} once:petsc once:slepc"
+PACKAGES="${PACKAGES} dealii"
+
 #########################################################################
 
 # Install the following deal.II version:
-- 
2.39.5