Skip to content
Snippets Groups Projects
Commit 27d31264 authored by Owen Parry's avatar Owen Parry Committed by Dave Moxey
Browse files

Make the CWIPI patch work with IntelLLVM.

parent 3b30415c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
+ 1
− 0
View file @ 27d31264
......@@ -21,6 +21,7 @@ v5.8.0
- Fixed Modified Arnoldi driver to remove discontinuities from random vectors (!2002)
- Addedd support for backing up filters output when the file name have already existis (!2006)
- Partially revert Geometry::v_ContainsPoint (!2007)
- Make the CWIPI third-party patch work with IntelLLVM (!2053)
**CI**
- Fix CubeAllElements performance test tolerance (!1943)
......
cmake/thirdparty-patches/cwipi-disable-warnings.patch
+ 7
− 4
View file @ 27d31264
......@@ -12,7 +12,8 @@ diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake
set (CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fcheck=bounds -fbacktrace")
@@ -29,7 +29,7 @@
elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
-elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+elseif (CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
- set (CMAKE_Fortran_FLAGS "-cpp -fpic -warn -diag-disable 7712")
+ set (CMAKE_Fortran_FLAGS "-w -cpp -fpic -warn -diag-disable 7712")
......@@ -39,7 +40,8 @@ diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake
set (CMAKE_C_FLAGS_DEBUG "-O0 -g")
@@ -153,7 +153,7 @@
elseif (CMAKE_C_COMPILER_ID STREQUAL "Intel")
-elseif (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+elseif (CMAKE_C_COMPILER_ID MATCHES "^Intel")
- set (CMAKE_C_FLAGS "-std=gnu99 -restrict -fpic -funsigned-char -Wall -Wcheck -Wshadow -Wpointer-arith -Wmissing-prototypes -Wuninitialized -Wunused -wd869,3656,177")
+ set (CMAKE_C_FLAGS "-std=gnu99 -restrict -fpic -funsigned-char -w")
......@@ -64,9 +66,10 @@ diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake
set (CMAKE_CXX_FLAGS_RELEASE "-O3")
set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
@@ -253,7 +253,7 @@
@@ -251,7 +251,7 @@
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "^Intel")
- set (CMAKE_CXX_FLAGS "-std=c++11 -fpic -funsigned-char -Wall -Wcheck -Wshadow -Wpointer-arith -Wmissing-prototypes -Wuninitialized -Wunused -wd869,3656,177")
+ set (CMAKE_CXX_FLAGS "-std=c++11 -fpic -funsigned-char -w")
......
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