diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ff2ea2a89bd9c49c0b294585ed7cff6b9719447..fee94339c6bcbc8a6fd2280d9857314acf3b477e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,6 +395,8 @@ if( WALBERLA_CXX_COMPILER_IS_INTEL ) # system headers are also supported by intel, but cmake does not recognize that set( CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem " ) add_flag ( CMAKE_CXX_FLAGS "-wd2928,2504,2259,1682,597" ) + # disable icc/icpc deprecation warning + add_flag ( CMAKE_CXX_FLAGS "-diag-disable=10441" ) elseif( WALBERLA_CXX_COMPILER_IS_GNU ) add_flag ( CMAKE_CXX_FLAGS "-Wfloat-equal -Wextra" ) elseif( WALBERLA_CXX_COMPILER_IS_NEC ) diff --git a/src/core/Variant.h b/src/core/Variant.h index 2be3f0a6c09e562dd48ef54b460dc08d786683d6..4295a641f940833bdd7558f6c9b86e93d669d5a5 100644 --- a/src/core/Variant.h +++ b/src/core/Variant.h @@ -21,9 +21,17 @@ #pragma once +// suppress conversion warning that is emitted by icpc compiler with `-Werror` +#if ( defined WALBERLA_CXX_COMPILER_IS_INTEL ) +#pragma warning(push) +#pragma warning disable 68 +#endif #include <variant> +#if ( defined WALBERLA_CXX_COMPILER_IS_INTEL ) +#pragma warning(pop) +#endif namespace walberla