From 3f17ef707085e03330aba38184e1b8c0f8097182 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Tue, 10 Nov 2015 17:01:57 +0100 Subject: [PATCH] deal.II: moves DEAL_CONFOPTS to the dealii.package --- deal.II-toolchain/packages/dealii.package | 38 +++++++++++++++++++++-- project-deal.II-toolchain.cfg | 21 ------------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 7151098..3cdb482 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -5,24 +5,44 @@ SOURCE=https://github.com/dealii/ PACKING=git BUILDCHAIN=cmake -######################################################################### +################################################################################ BUILDDIR=${BUILD_PATH}/deal.II-${VERSION} INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION} -######################################################################### +################################################################################ +#Choose configuration and components of deal.II + CONFOPTS=" \ ${DEAL_CONFOPTS} \ +-D CMAKE_BUILD_TYPE=DebugRelease \ +-D DEAL_II_WITH_MPI:BOOL=ON \ +-D DEAL_II_WITH_THREADS:BOOL=ON \ +-D DEAL_II_FORCE_BUNDLED_THREADS:BOOL=OFF \ +-D DEAL_II_COMPONENT_DOCUMENTATION:BOOL=OFF \ +-D DEAL_II_WITH_LAPACK:BOOL=ON \ +-D DEAL_II_WITH_UMFPACK:BOOL=ON \ +-D DEAL_II_FORCE_BUNDLED_UMFPACK:BOOL=OFF \ +-D DEAL_II_WITH_BOOST:BOOL=ON \ +-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 \ " +################################################################################ +# Add additional packages, if present + if [ ! -z "${ARPACK_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ + -D DEAL_II_WITH_ARPACK:BOOL=ON \ -D ARPACK_DIR=${ARPACK_DIR}" fi if [ ! -z "${METIS_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ + -D DEAL_II_WITH_METIS:BOOL=ON \ -D METIS_DIR=${METIS_DIR}" fi @@ -35,33 +55,47 @@ fi if [ ! -z "${P4EST_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ + -D DEAL_II_WITH_P4EST:BOOL=ON \ -D P4EST_DIR=${P4EST_DIR}" fi if [ ! -z "${HDF5_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ + -D DEAL_II_WITH_HDF5:BOOL=ON \ -D HDF5_DIR=${HDF5_DIR}" fi if [ ! -z "${TRILINOS_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ + -D DEAL_II_WITH_TRILINOS:BOOL=ON \ -D TRILINOS_DIR=${TRILINOS_DIR}" fi if [ ! -z "${PETSC_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ + -D DEAL_II_WITH_PETSC:BOOL=ON \ -D PETSC_DIR=${PETSC_DIR}" fi if [ ! -z "${SLEPC_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ + -D DEAL_II_WITH_SLEPC:BOOL=ON \ -D SLEPC_DIR=${SLEPC_DIR}" fi +if [ ! -z "${OPENCASCADE_DIR}" ]; then + CONFOPTS="\ + ${CONFOPTS} \ + -D DEAL_II_WITH_OPENCASCADE:BOOL=ON \" +fi + + +################################################################################ +################################################################################ # ********************************************************************************** package_specific_conf() { diff --git a/project-deal.II-toolchain.cfg b/project-deal.II-toolchain.cfg index 52812cf..8dacaa4 100644 --- a/project-deal.II-toolchain.cfg +++ b/project-deal.II-toolchain.cfg @@ -27,28 +27,7 @@ MIRROR="https://www.ces.clemson.edu/dealii/mirror/" ######################################################################### #Choose configuration and components of deal.II DEAL_CONFOPTS=" \ --D CMAKE_BUILD_TYPE=DebugRelease \ --D DEAL_II_COMPONENT_DOCUMENTATION:BOOL=OFF \ --D DEAL_II_WITH_ARPACK:BOOL=OFF \ --D DEAL_II_WITH_BOOST:BOOL=ON \ --D DEAL_II_FORCE_BUNDLED_BOOST:BOOL=OFF \ --D DEAL_II_WITH_FUNCTIONPARSER:BOOL=ON \ --D DEAL_II_WITH_LAPACK:BOOL=ON \ --D DEAL_II_WITH_METIS:BOOL=ON \ --D DEAL_II_WITH_MPI:BOOL=ON \ --D DEAL_II_WITH_NETCDF:BOOL=OFF \ -D DEAL_II_WITH_OPENCASCADE:BOOL=OFF \ --D DEAL_II_WITH_P4EST:BOOL=ON \ --D DEAL_II_WITH_PETSC:BOOL=ON \ --D DEAL_II_WITH_SLEPC:BOOL=ON \ --D DEAL_II_WITH_THREADS:BOOL=ON \ --D DEAL_II_FORCE_BUNDLED_THREADS:BOOL=OFF \ --D DEAL_II_WITH_TRILINOS:BOOL=ON \ --D DEAL_II_WITH_UMFPACK:BOOL=ON \ --D DEAL_II_FORCE_BUNDLED_UMFPACK:BOOL=OFF \ --D DEAL_II_WITH_ZLIB:BOOL=ON \ --D DEAL_II_WITH_HDF5:BOOL=ON \ --D DEAL_II_COMPONENT_MESH_CONVERTER:BOOL=ON \ -D DEAL_II_COMPONENT_PARAMETER_GUI=OFF \ " -- 2.39.5