]>
Commit | Line | Data |
---|---|---|
26d6f052 JR |
1 | diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c |
2 | --- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700 | |
3 | +++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c 2020-05-08 21:38:46.401363001 -0600 | |
4 | @@ -614,5 +614,5 @@ int ex_create_par_int(const char *path, | |
5 | * Prevent warning in some versions of ranlib(1) because the object | |
6 | * file has no symbols. | |
7 | */ | |
8 | -const char exodus_unused_symbol_dummy_1; | |
9 | +const char exodus_unused_symbol_dummy_ex_create_par; | |
10 | #endif | |
11 | diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c | |
12 | --- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700 | |
13 | +++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c 2020-05-08 21:38:46.402363007 -0600 | |
14 | @@ -474,5 +474,5 @@ int ex_open_par_int(const char *path, in | |
15 | * Prevent warning in some versions of ranlib(1) because the object | |
16 | * file has no symbols. | |
17 | */ | |
18 | -const char exodus_unused_symbol_dummy_1; | |
19 | +const char exodus_unused_symbol_dummy_ex_open_par; | |
20 | #endif | |
21 | diff -up VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake | |
22 | --- VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 2019-01-30 10:15:13.000000000 -0700 | |
23 | +++ VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake 2020-05-26 21:07:24.625840251 -0600 | |
24 | @@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibili | |
25 | execute_process(COMMAND ${CMAKE_C_COMPILER} --version | |
26 | OUTPUT_VARIABLE _gcc_version_info | |
27 | ERROR_VARIABLE _gcc_version_info) | |
28 | - string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" | |
29 | + string(REGEX MATCH "[1-9][0-9]*\\.[0-9]+\\.[0-9]+" | |
30 | _gcc_version "${_gcc_version_info}") | |
31 | # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the | |
32 | # patch level, handle this here: |