Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings

This commit is contained in:
Atgeirr Flø Rasmussen committed 2014-04-15 14:35:01 +02:00
commit c603103a3d
2 files changed
+18

No files matched your search

+14
View File
@@ -12,3 +12,17 @@ if (CXX_COMPAT_GCC)
add_options (ALL_LANGUAGES ALL_BUILDS "${_warn_flag}")
endif (_warn_flag)
endif ()
option(SILENCE_DUNE_WARNINGS "Disable warnings from DUNE?" OFF)
if(SILENCE_DUNE_WARNINGS AND CXX_COMPAT_GCC)
file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h "
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored \"-Wshadow\"
#pragma GCC diagnostic ignored \"-Wunused-parameter\"
#pragma GCC diagnostic ignored \"-Wignored-qualifiers\"
#pragma GCC diagnostic ignored \"-Wmismatched-tags\"")
file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "#pragma GCC diagnostic pop")
else()
file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h "")
file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "")
endif()
+4
View File
@@ -30,6 +30,8 @@
// the deprecated member anyway (in this compilation unit)
#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
#include "dune_disable_pragmas.h"
// TODO: clean up includes.
#include <dune/common/deprecated.hh>
#include <dune/common/version.hh>
@@ -49,6 +51,8 @@
#include <dune/istl/paamg/fastamg.hh>
#endif
#include "dune_reenable_pragmas.h"
#include <stdexcept>
#include <iostream>
#include <type_traits>