rpm/paraview
SHA256
1
0
Fork 0
forked from pool/paraview
Code Pull Requests Activity
2185483100
paraview/bundled_exodusii_add_missing_libpthread.patch

39 lines
1.4 KiB
Diff
Raw Normal View History

Accepting request 801712 from home:badshah400:branches:science (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
2020-05-11 16:26:57 +02:00
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
Accepting request 770701 from home:badshah400:branches:science Fix a typo in .changes in previous sr. - Update to version 5.7.0: See https://blog.kitware.com/paraview-5-7-0-release-notes/ - Split out new subpackages: libparaview5_7 for all the shared libs, paraview-plugins for bundled plugins, and python3-paraview for python3 bindings. - Move shared libraries to %{_libdir} and install them as part of libparaview5_7. - Update commands passed to cmake in keeping with upstream's overhaul. - Drop paraview-find-qhelpgenerator-qt5.patch: no longer needed. - Drop paraview-fix-file-contains-date-time.patch: GCC supports SOURCE_DATE_EPOCH and, as such, this fix is no longer needed. - Switch to python3: Paraview is production ready with python3 starting with version 5.7.0, and python2 support is slated to be dropped from the next major upgrade. - Rebase patches for updated version: * fix-libharu-missing-m.patch. * bundled_exodusii_add_missing_libpthread.patch. - New patches to fix linking problems introduced with version 5.7.0: * fix-loguru-missing-links.patch: Add linking to libraries libm, libdl, and libpthread when building loguru. * fix-QtGUI-missing-GLX_mesa-linking.patch: Link to library libGLX_mesa when building Qt GUI support. * paraview-link-against-python.patch to fix linking against the python library. - Patch 0001-Allow-compilation-on-GLES-platforms.patch needs rebase; commented out for now. - Switch an env based hashbang with one directly calling the required binary (python3 in this case). - Switch as many BuildRequires as possible to pkgconfig based ones. - Update rpmlintrc file to remove no longer needed filters and update the leftover filter (hidden file or dir) for directory change. OBS-URL: https://build.opensuse.org/request/show/770701 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=70
2020-02-11 01:33:43 +01:00
SOURCES ${sources}
HEADERS ${headers}
HEADERS_SUBDIR "vtkexodusII/include")
Accepting request 801712 from home:badshah400:branches:science (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
2020-05-11 16:26:57 +02:00
-target_compile_definitions(exodusII
+vtk_module_definitions(VTK::exodusII
Accepting request 770701 from home:badshah400:branches:science Fix a typo in .changes in previous sr. - Update to version 5.7.0: See https://blog.kitware.com/paraview-5-7-0-release-notes/ - Split out new subpackages: libparaview5_7 for all the shared libs, paraview-plugins for bundled plugins, and python3-paraview for python3 bindings. - Move shared libraries to %{_libdir} and install them as part of libparaview5_7. - Update commands passed to cmake in keeping with upstream's overhaul. - Drop paraview-find-qhelpgenerator-qt5.patch: no longer needed. - Drop paraview-fix-file-contains-date-time.patch: GCC supports SOURCE_DATE_EPOCH and, as such, this fix is no longer needed. - Switch to python3: Paraview is production ready with python3 starting with version 5.7.0, and python2 support is slated to be dropped from the next major upgrade. - Rebase patches for updated version: * fix-libharu-missing-m.patch. * bundled_exodusii_add_missing_libpthread.patch. - New patches to fix linking problems introduced with version 5.7.0: * fix-loguru-missing-links.patch: Add linking to libraries libm, libdl, and libpthread when building loguru. * fix-QtGUI-missing-GLX_mesa-linking.patch: Link to library libGLX_mesa when building Qt GUI support. * paraview-link-against-python.patch to fix linking against the python library. - Patch 0001-Allow-compilation-on-GLES-platforms.patch needs rebase; commented out for now. - Switch an env based hashbang with one directly calling the required binary (python3 in this case). - Switch as many BuildRequires as possible to pkgconfig based ones. - Update rpmlintrc file to remove no longer needed filters and update the leftover filter (hidden file or dir) for directory change. OBS-URL: https://build.opensuse.org/request/show/770701 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=70
2020-02-11 01:33:43 +01:00
PRIVATE
exoIIc_EXPORTS)
Accepting request 801712 from home:badshah400:branches:science (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
2020-05-11 16:26:57 +02:00
-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)
Copy Permalink