deal.II: handle PACKAGES settings in the main candi.cfg file

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 3cdb482d207a493c90bfa322fc455955a327dbf7..8c5f978d6f60d2168d1359284f94da245897736e 100644 (file)
--- 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 8dacaa4fbb6bf00bb7ad059f5366691dc3996116..72f611dc560d33df4436c2f824d30f3ee3b3b3cc 100644 (file)
--- 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: