Atri Bhattacharya
be13127c36
- Update to version 9.0.0 - Rebase patches still required for building: * bundled_exodusii_add_missing_libpthread.patch: Update to upstream patch (https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6865). * bundled_libharu_add_missing_libm.patch - Pass VTK_PYTHON_OPTIONAL_LINK:BOOL=OFF to cmake to link against the system python library explicitly. - Add vtk-parallelgeometry-dependency.patch to fix a missing dependency for vtkparallelgeometry (see https://discourse.vtk.org/t/building-vtk-9-0-fails-when-using-mpi-support/3227). - Comment out 0001-Allow-compilation-on-GLES-platforms.patch that no longer applies and needs extensive rebasing. - Drop patches incorporated or otherwise fixed upstream: * 0001-Make-code-calling-proj4-compatible-with-proj4-5.0-an.patch * 0001-Add-libogg-to-IOMovie-target-link-libraries.patch * python38.patch * reproducible.patch - Adapt to changes in upstream's cmake script: * Replace old options by their newer versions where applicable. * Pass VTK_USE_EXTERNAL=ON to use system libraries by default except for gl2ps, haru, and pugixml. - New BuildRequires: pegtl-devel and utfcpp-devel. - No longer needed to pass Java_JAVAH_EXECUTABLE:PATH=%{_bindir}/true to cmake; script does not look for javah any more. - Use autosetup to set up and patch sources: simplifies applying changing list of patches; use an if guard to avoid patch needing rebase while not running into conflict with factory bot. OBS-URL: https://build.opensuse.org/request/show/801834 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=156
64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From ca02bcc844e4d268ac5060f56f10467e2579fb43 Mon Sep 17 00:00:00 2001
|
|
From: Ben Boeckel <ben.boeckel@kitware.com>
|
|
Date: Thu, 7 May 2020 11:36:50 -0400
|
|
Subject: [PATCH 1/3] exodusII: also link to hdf5 directly
|
|
|
|
---
|
|
ThirdParty/exodusII/vtk.module | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
Index: VTK-9.0.0/ThirdParty/exodusII/vtk.module
|
|
===================================================================
|
|
--- VTK-9.0.0.orig/ThirdParty/exodusII/vtk.module
|
|
+++ VTK-9.0.0/ThirdParty/exodusII/vtk.module
|
|
@@ -3,5 +3,6 @@ NAME
|
|
LIBRARY_NAME
|
|
vtkexodusII
|
|
DEPENDS
|
|
+ VTK::hdf5
|
|
VTK::netcdf
|
|
THIRD_PARTY
|
|
|
|
From a98772f6d5f6b62c0f3ac360702b585c09bc5557 Mon Sep 17 00:00:00 2001
|
|
From: Seacas Upstream <kwrobot@kitware.com>
|
|
Date: Thu, 7 May 2020 12:22:01 -0400
|
|
Subject: [PATCH 3/3] exodusII 2020-05-07 (2c24a120)
|
|
|
|
Code extracted from:
|
|
|
|
https://gitlab.kitware.com/third-party/seacas.git
|
|
|
|
at commit 2c24a120deb77a8a2ea05462d0a60e7f9d90e58e (for/vtk-20200507-7.24f-v2019-12-18).
|
|
---
|
|
ThirdParty/exodusII/vtkexodusII/CMakeLists.txt | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt b/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
|
|
index 025abc43e0..d931004997 100644
|
|
--- a/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
|
|
+++ b/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
|
|
@@ -297,14 +297,19 @@ set(headers
|
|
"${CMAKE_CURRENT_BINARY_DIR}/include/exodusII_cfg.h"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/include/exodus_config.h")
|
|
|
|
+vtk_module_find_package(PACKAGE Threads)
|
|
+
|
|
vtk_module_add_module(VTK::exodusII
|
|
SOURCES ${sources}
|
|
HEADERS ${headers}
|
|
HEADERS_SUBDIR "vtkexodusII/include")
|
|
-target_compile_definitions(exodusII
|
|
+vtk_module_definitions(VTK::exodusII
|
|
PRIVATE
|
|
exoIIc_EXPORTS)
|
|
-target_include_directories(exodusII
|
|
+vtk_module_include(VTK::exodusII
|
|
PUBLIC
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
|
|
+vtk_module_link(VTK::exodusII
|
|
+ PRIVATE
|
|
+ Threads::Threads)
|
|
--
|
|
2.26.2
|