From f2d062a78df1284e91a57c414657e89b3d6a3b67 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 15 Apr 2015 17:56:25 +0200 Subject: [PATCH] *shhh* --- cmake/configure/configure_2_trilinos.cmake | 8 ++++++-- cmake/configure/configure_3_petsc.cmake | 2 +- cmake/configure/configure_opencascade.cmake | 11 ++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index c26a56489b..64d644f306 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -1,6 +1,6 @@ ## --------------------------------------------------------------------- ## -## Copyright (C) 2012 - 2014 by the deal.II authors +## Copyright (C) 2012 - 2015 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -192,13 +192,17 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL) SET(DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR "TrilinosWrappers::MPI::BlockVector") SET(DEAL_II_EXPAND_TRILINOS_MPI_VECTOR "TrilinosWrappers::MPI::Vector") + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused-function") + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused-parameter") + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused-variable") + # # Disable a bunch of warnings caused by Trilinos headers in older versions: # 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") + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused") ENDIF() ENDMACRO() diff --git a/cmake/configure/configure_3_petsc.cmake b/cmake/configure/configure_3_petsc.cmake index 2efa84c160..f966750ca8 100644 --- a/cmake/configure/configure_3_petsc.cmake +++ b/cmake/configure/configure_3_petsc.cmake @@ -1,6 +1,6 @@ ## --------------------------------------------------------------------- ## -## Copyright (C) 2012 - 2014 by the deal.II authors +## Copyright (C) 2012 - 2015 by the deal.II authors ## ## This file is part of the deal.II library. ## diff --git a/cmake/configure/configure_opencascade.cmake b/cmake/configure/configure_opencascade.cmake index d81a4c52ca..7e08259958 100644 --- a/cmake/configure/configure_opencascade.cmake +++ b/cmake/configure/configure_opencascade.cmake @@ -1,6 +1,6 @@ ## --------------------------------------------------------------------- ## -## Copyright (C) 2012 - 2014 by the deal.II authors +## Copyright (C) 2012 - 2015 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -16,4 +16,13 @@ # # Configuration for the OpenCASCADE library: # + +MACRO(FEATURE_OPENCASCADE_CONFIGURE_EXTERNAL) + # + # Disable a bunch of warnings caused by OpenCascade headers: + # + ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-extra") +ENDMACRO() + + CONFIGURE_FEATURE(OPENCASCADE) -- 2.39.5