From 23c24eb4197b3afbef3ede28e7375681b3ad27b2 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 4 Apr 2015 12:55:18 -0400 Subject: [PATCH] Enable Trilinos warnings in recent versions. At least for my local copy (11.12.1) GCC does not raise any warnings. --- cmake/configure/configure_2_trilinos.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index 1e251b6d72..c26a56489b 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -193,11 +193,13 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL) SET(DEAL_II_EXPAND_TRILINOS_MPI_VECTOR "TrilinosWrappers::MPI::Vector") # - # Disable a bunch of warnings caused by Trilinos headers: + # Disable a bunch of warnings caused by Trilinos headers in older versions: # - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused") - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-extra") - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-overloaded-virtual") + IF(TRILINOS_VERSION VERSION_LESS "11.12") + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused") + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-extra") + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-overloaded-virtual") + ENDIF() ENDMACRO() -- 2.39.5