From: Rene Gassmoeller Date: Fri, 2 Jun 2017 17:42:35 +0000 (-0500) Subject: Follow user options X-Git-Tag: v0.8.5~17^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d46115802bfd1dde74784faa017805f96cde66;p=candi.git Follow user options --- diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 1697db2..5834a76 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -16,7 +16,6 @@ INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION} #Choose general 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 \ @@ -29,7 +28,8 @@ ${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 \ +${DEAL_CONFOPTS}" ################################################################################ # Add additional packages, if present