From: Uwe Köcher Date: Tue, 10 Nov 2015 21:53:09 +0000 (+0100) Subject: deal.II: opencascade auto off X-Git-Tag: v0.8.1~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55964b960c10d45ad9a446d24cf9d21cdaec79e3;p=candi.git deal.II: opencascade auto off --- diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 2da0a7b..fb2cd4f 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -10,7 +10,10 @@ BUILDDIR=${BUILD_PATH}/deal.II-${VERSION} INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION} ################################################################################ -#Choose configuration and components of deal.II +# Please do not change the line below! + +################################################################################ +#Choose general configuration and components of deal.II CONFOPTS=" \ ${DEAL_CONFOPTS} \ @@ -112,6 +115,15 @@ if [ ! -z "${SLEPC_DIR}" ]; then fi # opencascade +if [[ ${PACKAGES_OFF} =~ 'opencascade' ]]; then + # Disable OPENCASCADE for deal.II, if a special DEAL_CONFOPTS together with + # the dealii-prepare loop forces opencascade to be off + if [ ! -z "${OPENCASCADE_DIR}" ]; then + cecho ${INFO} "deal.II: unset OPENCASCADE_DIR due to forced DEAL_II_WITH_OPENCASCADE:BOOL=OFF option" + unset OPENCASCADE_DIR + fi +fi + if [ ! -z "${OPENCASCADE_DIR}" ]; then cecho ${INFO} "deal.II: configuration with OPENCASCADE" CONFOPTS="\