rpm/vtk
SHA256
1
0
Fork 0
forked from pool/vtk
Code Pull Requests Activity
81c9ce56fe
vtk/bundled_libharu_add_missing_libm.patch

14 lines
537 B
Diff
Raw Normal View History

Accepting request 801834 from home:badshah400:branches:science - 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
2020-05-29 15:55:10 +02:00
Index: VTK-9.0.0/ThirdParty/libharu/vtklibharu/CMakeLists.txt
===================================================================
--- VTK-9.0.0.orig/ThirdParty/libharu/vtklibharu/CMakeLists.txt
+++ VTK-9.0.0/ThirdParty/libharu/vtklibharu/CMakeLists.txt
Accepting request 1029883 from home:StefanBruens:branches:science - Update to version 9.2.2, see: https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.2.md - Drop upstream patches: + 0001-Add-missing-libm-link-library-to-kissfft-module.patch - Use system libharu on Tumbleweed - Allow optionally building and running tests (disabled for now due to large required data set). FTBFS on Leap 15.3, but thats EOL in 5 weeks anyway. OBS-URL: https://build.opensuse.org/request/show/1029883 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=176
2022-10-20 17:10:02 +02:00
@@ -68,6 +68,8 @@ if(PNG_FOUND)
find_library(M_LIB m)
Accepting request 801834 from home:badshah400:branches:science - 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
2020-05-29 15:55:10 +02:00
endif ()
+link_libraries(m)
+
# =======================================================================
# configure header files, add compiler flags
# =======================================================================
Copy Permalink