forked from pool/paraview
Atri Bhattacharya
1f47470db2
(Sorry, only commented out a patch without removing it in previous sr)
- Drop patches no longer needed:
* 0001-Add-libogg-to-IOMovie-target-link-libraries.patch
* fix-loguru-missing-links.patch
* paraview-do-not-install-missing-vtk-doxygen-dir.patch
* paraview-link-against-python.patch: pass
DVTK_PYTHON_OPTIONAL_LINK=OFF to cmake instead (see
https://gitlab.kitware.com/vtk/vtk/-/issues/17881).
- Update bundled_exodusii_add_missing_libpthread.patch to version from upstream (https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6865).
OBS-URL: https://build.opensuse.org/request/show/801712
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=81
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
diff --git a/VTK/ThirdParty/exodusII/vtk.module b/VTK/ThirdParty/exodusII/vtk.module
|
|
index 27301eceb62f6200f69d65046a0e35a3572825e8..cb6bd927acd008a15c9d2df67d75cbbfd3237b57 100644
|
|
--- a/VTK/ThirdParty/exodusII/vtk.module
|
|
+++ b/VTK/ThirdParty/exodusII/vtk.module
|
|
@@ -3,5 +3,6 @@ NAME
|
|
LIBRARY_NAME
|
|
vtkexodusII
|
|
DEPENDS
|
|
+ VTK::hdf5
|
|
VTK::netcdf
|
|
THIRD_PARTY
|
|
diff --git a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt b/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
|
|
index 025abc43e0a8f9a94abdafdb7dfc95713d8f9216..d931004997f199c4aab57b94797043dd384fd2dd 100644
|
|
--- a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
|
|
+++ b/VTK/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)
|
|
|