Skip to content

Commit e7ff11b

Browse files
authored
Merge pull request #652 from dstoup/patch-vtk8.2-gcc10
Patch vtk8.2 gcc10
2 parents 4cd679f + 480e18e commit e7ff11b

File tree

4 files changed

+1148
-0
lines changed

4 files changed

+1148
-0
lines changed

Patches/VTK/8.2/Patch.cmake

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,18 @@
66
file(COPY ${VTK_PATCH_DIR}/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt
77
DESTINATION ${VTK_SOURCE_DIR}/ThirdParty/netcdf/vtknetcdf/
88
)
9+
10+
# Patch vtkExodusII build for gcc 10.
11+
# Bug report is posted here:
12+
# https://gitlab.kitware.com/vtk/vtk/-/issues/17774
13+
# Details of the patch are posted here:
14+
# https://discourse.slicer.org/t/build-fails-in-vtkexodus-on-linux/12018/5
15+
file(COPY ${VTK_PATCH_DIR}/ThirdParty/exodusII/update.sh
16+
DESTINATION ${VTK_SOURCE_DIR}/ThirdParty/exodusII/
17+
)
18+
file(COPY ${VTK_PATCH_DIR}/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
19+
DESTINATION ${VTK_SOURCE_DIR}/ThirdParty/exodusII/vtkexodusII/src
20+
)
21+
file(COPY ${VTK_PATCH_DIR}/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
22+
DESTINATION ${VTK_SOURCE_DIR}/ThirdParty/exodusII/vtkexodusII/src
23+
)
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
set -x
5+
shopt -s dotglob
6+
7+
readonly name="exodusII"
8+
readonly ownership="Seacas Upstream <kwrobot@kitware.com>"
9+
readonly subtree="ThirdParty/$name/vtk$name"
10+
readonly repo="https://gitlab.kitware.com/third-party/seacas.git"
11+
readonly tag="for/vtk-20200128-7.24f-v2019-12-18"
12+
readonly paths="
13+
packages/seacas/libraries/exodus/CMakeLists.vtk.txt
14+
packages/seacas/libraries/exodus/cmake/exodus_config.h.in
15+
packages/seacas/libraries/exodus/include/exodusII.h
16+
packages/seacas/libraries/exodus/include/exodusII_cfg.h.in
17+
packages/seacas/libraries/exodus/include/exodusII_int.h
18+
packages/seacas/libraries/exodus/include/vtk_exodusII_mangle.h
19+
packages/seacas/libraries/exodus/src/*.c
20+
packages/seacas/libraries/exodus/src/deprecated/*.c
21+
22+
packages/seacas/libraries/exodus/.gitattributes
23+
packages/seacas/libraries/exodus/COPYRIGHT
24+
packages/seacas/libraries/exodus/README
25+
packages/seacas/libraries/exodus/README.kitware.md
26+
"
27+
28+
extract_source () {
29+
git_archive
30+
pushd "$extractdir/$name-reduced"
31+
mv -v packages/seacas/libraries/exodus/* .
32+
rm -rvf packages
33+
mv -v CMakeLists.vtk.txt CMakeLists.txt
34+
popd
35+
}
36+
37+
. "${BASH_SOURCE%/*}/../update-common.sh"

0 commit comments

Comments
 (0)