Skip to content
Snippets Groups Projects
Commit afd3021d authored by Dominik Thoennes's avatar Dominik Thoennes
Browse files

Merge branch 'thoennes/CI-refactor-v2' into 'master'

CI refactor V2

See merge request walberla/walberla!629
parents 18ac1c69 23879187
Branches
No related merge requests found
This diff is collapsed.
......@@ -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 )
......
......@@ -21,9 +21,18 @@
#pragma once
// suppress conversion warning that is emitted by icpc compiler with `-Werror`
#include "waLBerlaDefinitions.h"
#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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment