OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change option name and generated header names.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2014-04-15 20:21:10 +02:00
parent e04cafe57e
commit 2a29deff1c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Modules/UseWarnings.cmake
View File

@ -14,8 +14,8 @@ if (CXX_COMPAT_GCC)
endif () endif ()
option(SILENCE_DUNE_WARNINGS "Disable warnings from DUNE?" OFF) option(SILENCE_DUNE_WARNINGS "Disable warnings from DUNE?" OFF)
if(SILENCE_DUNE_WARNINGS AND CXX_COMPAT_GCC) if(SILENCE_EXTERNAL_WARNINGS AND CXX_COMPAT_GCC)
file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h " file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h "
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored \"-Wdeprecated-declarations\" #pragma GCC diagnostic ignored \"-Wdeprecated-declarations\"
#pragma GCC diagnostic ignored \"-Wdeprecated-register\" #pragma GCC diagnostic ignored \"-Wdeprecated-register\"
@ -24,8 +24,8 @@ if(SILENCE_DUNE_WARNINGS AND CXX_COMPAT_GCC)
#pragma GCC diagnostic ignored \"-Wshadow\" #pragma GCC diagnostic ignored \"-Wshadow\"
#pragma GCC diagnostic ignored \"-Wsign-compare\" #pragma GCC diagnostic ignored \"-Wsign-compare\"
#pragma GCC diagnostic ignored \"-Wunused-parameter\"") #pragma GCC diagnostic ignored \"-Wunused-parameter\"")
file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "#pragma GCC diagnostic pop") file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "#pragma GCC diagnostic pop")
else() else()
file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h "") file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h "")
file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "") file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "")
endif() endif()

4
opm/core/linalg/LinearSolverIstl.cpp
View File

@ -30,7 +30,7 @@
// the deprecated member anyway (in this compilation unit) // the deprecated member anyway (in this compilation unit)
#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1 #define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
#include "dune_disable_pragmas.h" #include "disable_warning_pragmas.h"
// TODO: clean up includes. // TODO: clean up includes.
#include <dune/common/deprecated.hh> #include <dune/common/deprecated.hh>
@ -51,7 +51,7 @@
#include <dune/istl/paamg/fastamg.hh> #include <dune/istl/paamg/fastamg.hh>
#endif #endif
#include "dune_reenable_pragmas.h" #include "reenable_warning_pragmas.h"
#include <stdexcept> #include <stdexcept>
#include <iostream> #include <iostream>