OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 12:33:49 -06:00
Code Issues 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 committed by Bård Skaflestad
parent 682d8c394e
commit 5b79c0247f
1 changed files with 5 additions and 5 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()