Merge pull request #655 from atgeirr/disable-thirdparty-warnings
Refactor disabling of third-party warnings
This commit is contained in:
Atgeirr Flø Rasmussen
commit
0bb2fdeee4
@ -411,6 +411,8 @@ list (APPEND PUBLIC_HEADER_FILES
|
||||
opm/core/utility/parameters/ParameterXML.hpp
|
||||
opm/core/utility/parameters/tinyxml/tinystr.h
|
||||
opm/core/utility/parameters/tinyxml/tinyxml.h
|
||||
opm/core/utility/platform_dependent/disable_warnings.h
|
||||
opm/core/utility/platform_dependent/reenable_warnings.h
|
||||
opm/core/utility/PropertySystem.hpp
|
||||
opm/core/utility/share_obj.hpp
|
||||
opm/core/utility/thresholdPressures.hpp
|
||||
|
||||
@ -15,17 +15,5 @@ endif ()
|
||||
|
||||
option(SILENCE_EXTERNAL_WARNINGS "Disable some warnings from external packages (requires GCC 4.6 or newer)" OFF)
|
||||
if(SILENCE_EXTERNAL_WARNINGS AND CXX_COMPAT_GCC)
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h "
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored \"-Wdeprecated-declarations\"
|
||||
#pragma GCC diagnostic ignored \"-Wdeprecated-register\"
|
||||
#pragma GCC diagnostic ignored \"-Wignored-qualifiers\"
|
||||
#pragma GCC diagnostic ignored \"-Wmismatched-tags\"
|
||||
#pragma GCC diagnostic ignored \"-Wshadow\"
|
||||
#pragma GCC diagnostic ignored \"-Wsign-compare\"
|
||||
#pragma GCC diagnostic ignored \"-Wunused-parameter\"")
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "#pragma GCC diagnostic pop")
|
||||
else()
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h "")
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "")
|
||||
add_definitions(-DSILENCE_EXTERNAL_WARNINGS)
|
||||
endif()
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
// the deprecated member anyway (in this compilation unit)
|
||||
#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
|
||||
|
||||
#include "disable_warning_pragmas.h"
|
||||
#include <opm/core/utility/platform_dependent/disable_warnings.h>
|
||||
|
||||
// TODO: clean up includes.
|
||||
#include <dune/common/deprecated.hh>
|
||||
@ -51,7 +51,7 @@
|
||||
#include <dune/istl/paamg/fastamg.hh>
|
||||
#endif
|
||||
|
||||
#include "reenable_warning_pragmas.h"
|
||||
#include <opm/core/utility/platform_dependent/reenable_warnings.h>
|
||||
|
||||
#include <stdexcept>
|
||||
#include <iostream>
|
||||
|
||||
66
opm/core/utility/platform_dependent/disable_warnings.h
Normal file
66
opm/core/utility/platform_dependent/disable_warnings.h
Normal file
@ -0,0 +1,66 @@
|
||||
/*
|
||||
Copyright 2014 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
|
||||
OPM is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OPM is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// Note: this file shall not have include guards or #pragma once.
|
||||
|
||||
#ifdef SILENCE_EXTERNAL_WARNINGS
|
||||
|
||||
// To use this feature, we must have sufficiently new compiler.
|
||||
|
||||
// Using gcc is ok if version 4.6 or newer.
|
||||
#if defined(__GNUC__)
|
||||
# define __GNUC_VERSION__ (__GNUC__ * 100 \
|
||||
+ __GNUC_MINOR__ * 1)
|
||||
# if (__GNUC_VERSION__ >= 406)
|
||||
# define GNU_COMPILER_OK 1
|
||||
# else
|
||||
# define GNU_COMPILER_OK 0
|
||||
# endif
|
||||
#else
|
||||
# define GNU_COMPILER_OK 0
|
||||
#endif
|
||||
|
||||
// Uncertain what version of clang to require,
|
||||
// assume all versions are fine.
|
||||
#if defined(__clang__)
|
||||
# define CLANG_COMPILER_OK 1
|
||||
#else
|
||||
# define CLANG_COMPILER_OK 0
|
||||
#endif
|
||||
|
||||
// More compilers can be added here if necessary.
|
||||
#define COMPATIBLE_COMPILER (GNU_COMPILER_OK || CLANG_COMPILER_OK)
|
||||
|
||||
// If compiler is compatible, push current warning level
|
||||
// and ignore warnings that are usually generated from
|
||||
// third-party libraries that are not warning-clean.
|
||||
// Note that both clang and (newer) gcc accept the
|
||||
// "#pragma GCC diagnostic" syntax.
|
||||
#if COMPATIBLE_COMPILER
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-register"
|
||||
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
|
||||
#pragma GCC diagnostic ignored "-Wmismatched-tags"
|
||||
#pragma GCC diagnostic ignored "-Wshadow"
|
||||
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
#endif // COMPATIBLE_COMPILER
|
||||
|
||||
#endif // SILENCE_EXTERNAL_WARNINGS
|
||||
57
opm/core/utility/platform_dependent/reenable_warnings.h
Normal file
57
opm/core/utility/platform_dependent/reenable_warnings.h
Normal file
@ -0,0 +1,57 @@
|
||||
/*
|
||||
Copyright 2014 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
|
||||
OPM is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OPM is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// Note: this file shall not have include guards or #pragma once.
|
||||
|
||||
#ifdef SILENCE_EXTERNAL_WARNINGS
|
||||
|
||||
// To use this feature, we must have sufficiently new compiler.
|
||||
|
||||
// Using gcc is ok if version 4.6 or newer.
|
||||
#if defined(__GNUC__)
|
||||
# define __GNUC_VERSION__ (__GNUC__ * 100 \
|
||||
+ __GNUC_MINOR__ * 1)
|
||||
# if (__GNUC_VERSION__ >= 406)
|
||||
# define GNU_COMPILER_OK 1
|
||||
# else
|
||||
# define GNU_COMPILER_OK 0
|
||||
# endif
|
||||
#else
|
||||
# define GNU_COMPILER_OK 0
|
||||
#endif
|
||||
|
||||
// Uncertain what version of clang to require,
|
||||
// assume all versions are fine.
|
||||
#if defined(__clang__)
|
||||
# define CLANG_COMPILER_OK 1
|
||||
#else
|
||||
# define CLANG_COMPILER_OK 0
|
||||
#endif
|
||||
|
||||
// More compilers can be added here if necessary.
|
||||
#define COMPATIBLE_COMPILER (GNU_COMPILER_OK || CLANG_COMPILER_OK)
|
||||
|
||||
// If compiler is compatible, pop current warning level.
|
||||
// Note that both clang and (newer) gcc accept the
|
||||
// "#pragma GCC diagnostic" syntax.
|
||||
#if COMPATIBLE_COMPILER
|
||||
#pragma GCC diagnostic pop
|
||||
#endif // COMPATIBLE_COMPILER
|
||||
|
||||
#endif // SILENCE_EXTERNAL_WARNINGS
|
||||
Loading…
Reference in New Issue
Block a user