From 99d8620262cc53b59cba6e001052892dc88146cd Mon Sep 17 00:00:00 2001 From: Fabian Castelli Date: Wed, 30 Jun 2021 19:16:18 +0200 Subject: [PATCH] Minor consistency update --- deal.II-toolchain/packages/adolc.package | 7 +++++-- deal.II-toolchain/packages/dealii.package | 9 ++++++--- deal.II-toolchain/packages/gmsh.package | 7 +++++-- deal.II-toolchain/packages/opencascade.package | 7 +++++-- deal.II-toolchain/packages/symengine.package | 7 +++++-- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/deal.II-toolchain/packages/adolc.package b/deal.II-toolchain/packages/adolc.package index bb9e2f2..29f0cb3 100644 --- a/deal.II-toolchain/packages/adolc.package +++ b/deal.II-toolchain/packages/adolc.package @@ -2,8 +2,11 @@ ## ADOLC ## ################################################################################ -# Option {ON|OFF}: Choose whether to load the tarball or the git repository. -CANDI_ADOLC_LOAD_TARBALL=ON +# By default load the tarball. +# To load the git repository define a variable CANDI_ADOLC_LOAD_TARBALL=OFF. +if [ -z ${CANDI_ADOLC_LOAD_TARBALL} ]; then + CANDI_ADOLC_LOAD_TARBALL=ON +fi if [ ${CANDI_ADOLC_LOAD_TARBALL} = ON ]; then # download release tarball diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 008660b..566a42a 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -222,7 +222,8 @@ fi if [ ! -z "${OPENCASCADE_DIR}" ]; then cecho ${INFO} "deal.II: configuration with OPENCASCADE" CONFOPTS="${CONFOPTS} \ - -D DEAL_II_WITH_OPENCASCADE:BOOL=ON" + -D DEAL_II_WITH_OPENCASCADE:BOOL=ON \ + -D OPENCASCADE_DIR=${OPENCASCADE_DIR}" fi ######################################## @@ -253,7 +254,8 @@ fi if [ ! -z "${SYMENGINE_DIR}" ]; then cecho ${INFO} "deal.II: configuration with SYMENGINE" CONFOPTS="${CONFOPTS} \ - -D DEAL_II_WITH_SYMENGINE:BOOL=ON" + -D DEAL_II_WITH_SYMENGINE:BOOL=ON \ + -D SYMENGINE_DIR=${SYMENGINE_DIR}" fi ######################################## @@ -284,7 +286,8 @@ fi if [ ! -z "${ADOLC_DIR}" ]; then cecho ${INFO} "deal.II: configuration with ADOLC" CONFOPTS="${CONFOPTS} \ - -D DEAL_II_WITH_ADOLC:BOOL=ON" + -D DEAL_II_WITH_ADOLC:BOOL=ON \ + -D ADOLC_DIR=${ADOLC_DIR}" fi ################################################################################ diff --git a/deal.II-toolchain/packages/gmsh.package b/deal.II-toolchain/packages/gmsh.package index b4a816b..fdc0521 100644 --- a/deal.II-toolchain/packages/gmsh.package +++ b/deal.II-toolchain/packages/gmsh.package @@ -2,8 +2,11 @@ ## GMSH ## ################################################################################ -# Option {ON|OFF}: Choose whether to load the tarball or the git repository. -CANDI_GMSH_LOAD_TARBALL=ON +# By default load the tarball. +# To load the git repository define a variable CANDI_GMSH_LOAD_TARBALL=OFF. +if [ -z ${CANDI_GMSH_LOAD_TARBALL} ]; then + CANDI_GMSH_LOAD_TARBALL=ON +fi if [ ${CANDI_GMSH_LOAD_TARBALL} = ON ]; then # see http://gmsh.info/src/ diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package index 9a6ea9c..4922303 100644 --- a/deal.II-toolchain/packages/opencascade.package +++ b/deal.II-toolchain/packages/opencascade.package @@ -2,8 +2,11 @@ ## OPENCASCADE ## ################################################################################ -# Option {ON|OFF}: Choose whether to load the tarball or the git repository. -CANDI_OPENCASCADE_LOAD_TARBALL=ON +# By default load the tarball. +# To load the git repository define a variable CANDI_OPENCASCADE_LOAD_TARBALL=OFF. +if [ -z ${CANDI_OPENCASCADE_LOAD_TARBALL} ]; then + CANDI_OPENCASCADE_LOAD_TARBALL=ON +fi if [ ${CANDI_OPENCASCADE_LOAD_TARBALL} = ON ]; then # download release tarball diff --git a/deal.II-toolchain/packages/symengine.package b/deal.II-toolchain/packages/symengine.package index 066168a..9be8309 100644 --- a/deal.II-toolchain/packages/symengine.package +++ b/deal.II-toolchain/packages/symengine.package @@ -2,8 +2,11 @@ ## SYMENGINE ## ################################################################################ -# Option {ON|OFF}: Choose whether to load the tarball or the git repository. -CANDI_SYMENGINE_LOAD_TARBALL=OFF +# By default load the tarball. +# To load the git repository define a variable CANDI_SYMENGINE_LOAD_TARBALL=OFF. +if [ -z ${CANDI_SYMENGINE_LOAD_TARBALL} ]; then + CANDI_SYMENGINE_LOAD_TARBALL=ON +fi if [ ${CANDI_SYMENGINE_LOAD_TARBALL} = ON ]; then # download release tarball -- 2.39.5