From: Bruno Turcksin Date: Tue, 14 Jul 2015 22:56:43 +0000 (-0500) Subject: Fix a bug in Trilinos configuration. X-Git-Tag: v0.5~6^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e71c0d2d047da5d42ffed0c671431ef3866d7b7;p=candi.git Fix a bug in Trilinos configuration. --- diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package index f66adde..6461679 100644 --- a/deal.II/packages/trilinos.package +++ b/deal.II/packages/trilinos.package @@ -14,9 +14,9 @@ CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \ -D Trilinos_ENABLE_Stratimikos:BOOL=ON \ -D Trilinos_ENABLE_Belos:BOOL=ON \ -D Trilinos_ENABLE_MueLu:BOOL=OFF \ - -D TPL_ENABLE_ParMETIS:BOOL=ON \ + -D TPL_ENABLE_ParMETIS:BOOL=${ParMETIS} \ -D TPL_ParMETIS_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libparmetis.so \ - -D TPL_ENABLE_SuperLUDist:BOOL=ON \ + -D TPL_ENABLE_SuperLUDist:BOOL=${SuperLUDist} \ -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist.so \ -D SuperLUDist_INCLUDE_DIRS:PATH=${INSTALL_PATH}/include/superlu \ -D CMAKE_BUILD_TYPE:STRING=RELEASE \ diff --git a/project-deal.II.cfg b/project-deal.II.cfg index 61ebf32..1777c64 100644 --- a/project-deal.II.cfg +++ b/project-deal.II.cfg @@ -115,14 +115,15 @@ for PACKAGE in ${DEAL_CONFOPTS[@]}; do esac done -# Turn off parmetis if metis is off. +# Turn off ParMETIS and SuperLU_dist if metis is off. if [[ ${PACKAGES_OFF} =~ 'METIS' ]]; then PACKAGES_OFF=${PACKAGES_OFF}' PARMETIS'; -fi - -# Turn off SuperLU_dist of Trilinos is off. -if [[ ${PACKAGES_OFF} =~ 'TRILINOS' ]]; then PACKAGES_OFF=${PACKAGES_OFF}' SUPERLU_DIST'; + ParMetis=OFF + SuperLUDist=OFF +else + ParMETIS=ON + SuperLUDist=ON fi # Transform upper case to lower case.