From: Timo Heister Date: Thu, 6 Apr 2023 17:24:28 +0000 (-0400) Subject: support trilinos and netcdf on M1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39f1ff405917e760e9f680bfea6481ced3eab07c;p=candi.git support trilinos and netcdf on M1 --- diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index aa9a4cb..81df78c 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -201,7 +201,10 @@ if [ ! -z "${SUPERLU_DIR}" ]; then fi # support netCDF and SEACAS (if netCDF is available) -if [ ! -z "${NETCDF_DIR}" ]; then +if [ -z "${TRILINOS_WITH_SEACAS}" ]; then + TRILINOS_WITH_SEACAS=ON +fi +if [ ${TRILINOS_WITH_SEACAS} = ON ] && [ ! -z "${NETCDF_DIR}" ]; then cecho ${INFO} "trilinos: configuration with netCDF and SEACAS" CONFOPTS="${CONFOPTS} \ @@ -227,7 +230,6 @@ CONFOPTS="\ -D Trilinos_ENABLE_Ifpack:BOOL=ON \ -D Trilinos_ENABLE_Ifpack2:BOOL=OFF \ -D Trilinos_ENABLE_Tpetra:BOOL=ON \ - -D Tpetra_INST_INT_LONG_LONG:BOOL=ON \ -D Trilinos_ENABLE_AztecOO:BOOL=ON \ -D Trilinos_ENABLE_Sacado:BOOL=ON \ -D Trilinos_ENABLE_Teuchos:BOOL=ON \ diff --git a/deal.II-toolchain/platforms/supported/macos.platform b/deal.II-toolchain/platforms/supported/macos.platform index ac25c41..bbf12c5 100644 --- a/deal.II-toolchain/platforms/supported/macos.platform +++ b/deal.II-toolchain/platforms/supported/macos.platform @@ -46,3 +46,12 @@ # you may change the security policy for developments. To do so, # enable Terminal in System Preferences / Security & Privacy / Developer Tools . ## + +if [ "$(machine)" = "arm64e" ]; then + cecho ${INFO} "MacOS on arm64 detected!" + + # Trilinos will link with netcdf and indirectly hdf5, but linking fails. Just + # disable this for now. + TRILINOS_WITH_SEACAS=OFF + +fi