Accepting request 619762 from science
OBS-URL: https://build.opensuse.org/request/show/619762 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vtk?expand=0&rev=35
This commit is contained in:
commit
779aa04551
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:6e269f07b64fb13774f5925161fb4e1f379f4e6a0131c8408c555f6b58ef3cb7
|
|
||||||
size 33482506
|
|
3
VTK-8.1.1.tar.gz
Normal file
3
VTK-8.1.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324
|
||||||
|
size 33482287
|
110
fix_qt5_example_cmake.patch
Normal file
110
fix_qt5_example_cmake.patch
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
From 54e43bf38f7b8af1fa1bfc934a27f2443fe304d2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Todd <toddrme2178@gmail.com>
|
||||||
|
Date: Mon, 11 Jun 2018 15:40:00 -0400
|
||||||
|
Subject: [PATCH 1/8] Use `target_link_libraries` instead of `qt5_use_modules`.
|
||||||
|
|
||||||
|
diff --git a/Examples/GUI/Qt/Events/CMakeLists.txt b/Examples/GUI/Qt/Events/CMakeLists.txt
|
||||||
|
--- a/Examples/GUI/Qt/Events/CMakeLists.txt
|
||||||
|
+++ b/Examples/GUI/Qt/Events/CMakeLists.txt
|
||||||
|
@@ -43,7 +43,7 @@
|
||||||
|
|
||||||
|
add_executable(qtevents
|
||||||
|
MACOSX_BUNDLE ${Srcs} ${Hdrs} ${UI_Srcs} ${MOC_Hdrs})
|
||||||
|
- qt5_use_modules(qtevents Core Gui Widgets)
|
||||||
|
+ target_link_libraries(qtevents Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
|
target_link_libraries(qtevents ${VTK_LIBRARIES})
|
||||||
|
else()
|
||||||
|
find_package(Qt4 REQUIRED)
|
||||||
|
|
||||||
|
diff --git a/Examples/GUI/Qt/FourPaneViewer/CMakeLists.txt b/Examples/GUI/Qt/FourPaneViewer/CMakeLists.txt
|
||||||
|
--- a/Examples/GUI/Qt/FourPaneViewer/CMakeLists.txt
|
||||||
|
+++ b/Examples/GUI/Qt/FourPaneViewer/CMakeLists.txt
|
||||||
|
@@ -46,7 +46,7 @@
|
||||||
|
|
||||||
|
# CMAKE_AUTOMOC in ON so the MocHdrs will be automatically wrapped.
|
||||||
|
add_executable(QtVTKRenderWindows ${Srcs} ${Hdrs} ${UI_Srcs} ${MOC_Hdrs})
|
||||||
|
- qt5_use_modules(QtVTKRenderWindows Core Gui Widgets)
|
||||||
|
+ target_link_libraries(QtVTKRenderWindows Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
|
target_link_libraries(QtVTKRenderWindows ${VTK_LIBRARIES})
|
||||||
|
else()
|
||||||
|
find_package(Qt4 REQUIRED)
|
||||||
|
|
||||||
|
diff --git a/Examples/GUI/Qt/GraphicsView/CMakeLists.txt b/Examples/GUI/Qt/GraphicsView/CMakeLists.txt
|
||||||
|
--- a/Examples/GUI/Qt/GraphicsView/CMakeLists.txt
|
||||||
|
+++ b/Examples/GUI/Qt/GraphicsView/CMakeLists.txt
|
||||||
|
@@ -61,8 +61,9 @@
|
||||||
|
|
||||||
|
add_executable(qtgraphicsview MACOSX_BUNDLE
|
||||||
|
${Srcs} ${Hdrs} ${MOC_Hdrs} ${QRC_Srcs})
|
||||||
|
- qt5_use_modules(qtgraphicsview Core Gui Widgets
|
||||||
|
- WebKit WebKitWidgets OpenGL OpenGLExtensions)
|
||||||
|
+ target_link_libraries(qtgraphicsview Qt5::Core Qt5::Gui Qt5::Widgets
|
||||||
|
+ Qt5::WebKit Qt5::WebKitWidgets
|
||||||
|
+ Qt5::OpenGL Qt5::OpenGLExtensions)
|
||||||
|
target_link_libraries(qtgraphicsview ${VTK_LIBRARIES})
|
||||||
|
else()
|
||||||
|
find_package(Qt4 REQUIRED)
|
||||||
|
|
||||||
|
diff --git a/Examples/GUI/Qt/ImageViewer/CMakeLists.txt b/Examples/GUI/Qt/ImageViewer/CMakeLists.txt
|
||||||
|
--- a/Examples/GUI/Qt/ImageViewer/CMakeLists.txt
|
||||||
|
+++ b/Examples/GUI/Qt/ImageViewer/CMakeLists.txt
|
||||||
|
@@ -21,6 +21,6 @@
|
||||||
|
find_package(Qt5 COMPONENTS Core REQUIRED QUIET)
|
||||||
|
|
||||||
|
add_executable(qtimageviewer ${Srcs})
|
||||||
|
- qt5_use_modules(qtimageviewer Core Gui Widgets)
|
||||||
|
+ target_link_libraries(qtimageviewer Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
|
target_link_libraries(qtimageviewer ${VTK_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
diff --git a/Examples/GUI/Qt/SimpleView/CMakeLists.txt b/Examples/GUI/Qt/SimpleView/CMakeLists.txt
|
||||||
|
--- a/Examples/GUI/Qt/SimpleView/CMakeLists.txt
|
||||||
|
+++ b/Examples/GUI/Qt/SimpleView/CMakeLists.txt
|
||||||
|
@@ -64,7 +64,7 @@
|
||||||
|
|
||||||
|
add_executable(SimpleView MACOSX_BUNDLE
|
||||||
|
${Srcs} ${Hdrs} ${UI_Srcs} ${MOC_Hdrs} ${QRC_Srcs})
|
||||||
|
- qt5_use_modules(SimpleView Core Gui Widgets)
|
||||||
|
+ target_link_libraries(SimpleView Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
|
target_link_libraries(SimpleView ${VTK_LIBRARIES})
|
||||||
|
else()
|
||||||
|
find_package(Qt4 REQUIRED)
|
||||||
|
|
||||||
|
diff --git a/Examples/Infovis/Cxx/CustomLinkView/CMakeLists.txt b/Examples/Infovis/Cxx/CustomLinkView/CMakeLists.txt
|
||||||
|
--- a/Examples/Infovis/Cxx/CustomLinkView/CMakeLists.txt
|
||||||
|
+++ b/Examples/Infovis/Cxx/CustomLinkView/CMakeLists.txt
|
||||||
|
@@ -65,7 +65,7 @@
|
||||||
|
add_executable(CustomLinkView
|
||||||
|
MACOSX_BUNDLE ${Srcs} ${Hdrs} ${UI_Srcs} ${MOC_Hdrs} ${Rcs_Srcs})
|
||||||
|
|
||||||
|
- qt5_use_modules(CustomLinkView Core Gui Widgets)
|
||||||
|
+ target_link_libraries(CustomLinkView Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
|
|
||||||
|
target_link_libraries(CustomLinkView ${VTK_LIBRARIES})
|
||||||
|
else()
|
||||||
|
|
||||||
|
diff --git a/Examples/Infovis/Cxx/EasyView/CMakeLists.txt b/Examples/Infovis/Cxx/EasyView/CMakeLists.txt
|
||||||
|
--- a/Examples/Infovis/Cxx/EasyView/CMakeLists.txt
|
||||||
|
+++ b/Examples/Infovis/Cxx/EasyView/CMakeLists.txt
|
||||||
|
@@ -74,7 +74,7 @@
|
||||||
|
add_executable(EasyView
|
||||||
|
MACOSX_BUNDLE ${Srcs} ${Hdrs} ${UI_Srcs} ${MOC_Hdrs} ${Rcs_Srcs})
|
||||||
|
|
||||||
|
- qt5_use_modules(EasyView Core Gui Widgets)
|
||||||
|
+ target_link_libraries(EasyView Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
|
|
||||||
|
target_link_libraries(EasyView ${VTK_LIBRARIES})
|
||||||
|
else()
|
||||||
|
|
||||||
|
diff --git a/Examples/Infovis/Cxx/StatsView/CMakeLists.txt b/Examples/Infovis/Cxx/StatsView/CMakeLists.txt
|
||||||
|
--- a/Examples/Infovis/Cxx/StatsView/CMakeLists.txt
|
||||||
|
+++ b/Examples/Infovis/Cxx/StatsView/CMakeLists.txt
|
||||||
|
@@ -62,7 +62,7 @@
|
||||||
|
add_executable(StatsView
|
||||||
|
MACOSX_BUNDLE ${Srcs} ${Hdrs} ${UI_Srcs} ${MOC_Hdrs} ${Rcs_Srcs})
|
||||||
|
|
||||||
|
- qt5_use_modules(StatsView Core Gui Widgets)
|
||||||
|
+ target_link_libraries(StatsView Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
|
|
||||||
|
target_link_libraries(StatsView ${VTK_LIBRARIES})
|
||||||
|
else()
|
@ -8,4 +8,12 @@ addFilter(".* no-manual-page-for-binary")
|
|||||||
# This is not a versioned shared lib, and not used by anything other than
|
# This is not a versioned shared lib, and not used by anything other than
|
||||||
# vtk's java bindings, simply package it with the vtk-java subpackage
|
# vtk's java bindings, simply package it with the vtk-java subpackage
|
||||||
addFilter("vtk-java.* shlib-policy-name-error")
|
addFilter("vtk-java.* shlib-policy-name-error")
|
||||||
|
addFilter("vtk-java.* shlib-policy-missing-suffix")
|
||||||
|
addFilter("vtk-java.* devel-file-in-non-devel-package")
|
||||||
addFilter("vtk-compat_gl-java.* shlib-policy-name-error")
|
addFilter("vtk-compat_gl-java.* shlib-policy-name-error")
|
||||||
|
addFilter("vtk-compat_gl-java.* shlib-policy-missing-suffix")
|
||||||
|
addFilter("vtk-compat_gl-java.* devel-file-in-non-devel-package")
|
||||||
|
|
||||||
|
# Used by tcl bindings
|
||||||
|
addFilter("vtk-tcl.* devel-file-in-non-devel-package")
|
||||||
|
addFilter("vtk-compat_gl-tcl.* devel-file-in-non-devel-package")
|
||||||
|
32
vtk.changes
32
vtk.changes
@ -1,3 +1,35 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jun 29 07:17:51 UTC 2018 - badshah400@gmail.com
|
||||||
|
|
||||||
|
- Drop post[un] scripts for devel and java subpackages; they are
|
||||||
|
only needed for the versioned shlib.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 11 20:06:48 UTC 2018 - toddrme2178@gmail.com
|
||||||
|
|
||||||
|
- Update to version 8.1.1:
|
||||||
|
* Fixed thin border around vtkImageResliceMapper
|
||||||
|
rendering
|
||||||
|
* Fixed vtkImageResliceMapper showing a black
|
||||||
|
polygon when slice is out of bounds.
|
||||||
|
* Fixed conflict between Process.h and process.h
|
||||||
|
* Fixed building VTK 8.1 against 10.13 SDK
|
||||||
|
resulting in linker errors when trying to use
|
||||||
|
resulting libraries on older SDK
|
||||||
|
* Fixed vtkCellPicker::IntersectActorWithLine maybe
|
||||||
|
using invalid cell id when picking composite data
|
||||||
|
- Add fix_qt5_example_cmake.patch
|
||||||
|
Fixes use of removed cmake macro in some examples
|
||||||
|
See: https://gitlab.kitware.com/vtk/vtk/issues/17336
|
||||||
|
- Use modern cmake spec file macros
|
||||||
|
- Run spec cleaner
|
||||||
|
- Other spec file cleanups
|
||||||
|
- Support parallel HDF5.
|
||||||
|
- Drop support for qt4. Any version of openSUSE with a recent
|
||||||
|
enough version of cmake to build the package supports Qt5.
|
||||||
|
- Drop checks for old versions of openSUSE that have too old
|
||||||
|
of a cmake to build.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Feb 4 00:41:17 UTC 2018 - stefan.bruens@rwth-aachen.de
|
Sun Feb 4 00:41:17 UTC 2018 - stefan.bruens@rwth-aachen.de
|
||||||
|
|
||||||
|
228
vtk.spec
228
vtk.spec
@ -23,7 +23,7 @@
|
|||||||
%define shlib %{vtklib}
|
%define shlib %{vtklib}
|
||||||
|
|
||||||
Name: vtk
|
Name: vtk
|
||||||
Version: 8.1.0
|
Version: 8.1.1
|
||||||
Release: 0
|
Release: 0
|
||||||
%define series 8.1
|
%define series 8.1
|
||||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||||
@ -32,7 +32,7 @@ Release: 0
|
|||||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Productivity/Scientific/Other
|
Group: Productivity/Scientific/Other
|
||||||
Url: http://vtk.org/
|
URL: http://vtk.org/
|
||||||
Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz
|
Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz
|
||||||
# FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later
|
# FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later
|
||||||
# We need to use the compat conditionals here to avoid Factory's source validator from tripping up
|
# We need to use the compat conditionals here to avoid Factory's source validator from tripping up
|
||||||
@ -41,16 +41,10 @@ Source1: vtk-rpmlintrc
|
|||||||
Patch1: vtk-fix-file-contains-date-time.patch
|
Patch1: vtk-fix-file-contains-date-time.patch
|
||||||
# PATCH-FIX-OPENSUSE 0001-Allow-compilation-on-GLES-platforms.patch VTK issue #17113 stefan.bruens@rwth-aachen.de -- Fix building with Qt GLES builds
|
# PATCH-FIX-OPENSUSE 0001-Allow-compilation-on-GLES-platforms.patch VTK issue #17113 stefan.bruens@rwth-aachen.de -- Fix building with Qt GLES builds
|
||||||
Patch3: 0001-Allow-compilation-on-GLES-platforms.patch
|
Patch3: 0001-Allow-compilation-on-GLES-platforms.patch
|
||||||
|
# PATCH-FIX-UPSTREAM fix_qt5_example_cmake.patch -- Fix for recent Qt5 version https://gitlab.kitware.com/vtk/vtk/issues/17336
|
||||||
|
Patch4: fix_qt5_example_cmake.patch
|
||||||
BuildRequires: Mesa-libGL-devel
|
BuildRequires: Mesa-libGL-devel
|
||||||
BuildRequires: R-base-devel
|
BuildRequires: R-base-devel
|
||||||
%if 0%{?suse_version} >= 1500
|
|
||||||
BuildRequires: libboost_graph-devel
|
|
||||||
BuildRequires: libboost_graph_parallel-devel
|
|
||||||
BuildRequires: libboost_mpi-devel
|
|
||||||
BuildRequires: libboost_serialization-devel
|
|
||||||
%else
|
|
||||||
BuildRequires: boost-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: cmake >= 3.4
|
BuildRequires: cmake >= 3.4
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -61,9 +55,19 @@ BuildRequires: gl2ps-devel
|
|||||||
BuildRequires: gnuplot
|
BuildRequires: gnuplot
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: hdf5-devel
|
BuildRequires: hdf5-devel
|
||||||
|
BuildRequires: hdf5-openmpi-devel
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
|
BuildRequires: jsoncpp-devel
|
||||||
BuildRequires: libX11-devel
|
BuildRequires: libX11-devel
|
||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
|
%if 0%{?suse_version} >= 1500
|
||||||
|
BuildRequires: libboost_graph-devel
|
||||||
|
BuildRequires: libboost_graph_parallel-devel
|
||||||
|
BuildRequires: libboost_mpi-devel
|
||||||
|
BuildRequires: libboost_serialization-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: boost-devel
|
||||||
|
%endif
|
||||||
BuildRequires: libexpat-devel
|
BuildRequires: libexpat-devel
|
||||||
BuildRequires: libiodbc-devel
|
BuildRequires: libiodbc-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
@ -77,38 +81,23 @@ BuildRequires: netcdf-devel
|
|||||||
BuildRequires: openmpi-devel
|
BuildRequires: openmpi-devel
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-mpi4py-devel
|
BuildRequires: python3-mpi4py-devel
|
||||||
|
BuildRequires: python3-qt5-devel
|
||||||
BuildRequires: tcl-devel
|
BuildRequires: tcl-devel
|
||||||
BuildRequires: tk-devel
|
BuildRequires: tk-devel
|
||||||
BuildRequires: wget
|
BuildRequires: wget
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
%if 0%{?suse_version} > 1320
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
BuildRequires: python3-qt5-devel
|
|
||||||
BuildRequires: pkgconfig(Qt5OpenGL)
|
BuildRequires: pkgconfig(Qt5OpenGL)
|
||||||
BuildRequires: pkgconfig(Qt5OpenGLExtensions)
|
BuildRequires: pkgconfig(Qt5OpenGLExtensions)
|
||||||
BuildRequires: pkgconfig(Qt5Sql)
|
BuildRequires: pkgconfig(Qt5Sql)
|
||||||
BuildRequires: pkgconfig(Qt5WebKitWidgets)
|
BuildRequires: pkgconfig(Qt5WebKitWidgets)
|
||||||
BuildRequires: pkgconfig(Qt5Widgets)
|
BuildRequires: pkgconfig(Qt5Widgets)
|
||||||
%else
|
Provides: python3-%{name}-qt = %{version}
|
||||||
BuildRequires: libQtWebKit-devel
|
|
||||||
BuildRequires: libqt4-devel
|
|
||||||
BuildRequires: python3-qt4-devel
|
|
||||||
%endif
|
|
||||||
%if %{?sles_version}
|
%if %{?sles_version}
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
%else
|
%else
|
||||||
BuildRequires: pkgconfig(libxml-2.0)
|
BuildRequires: pkgconfig(libxml-2.0)
|
||||||
%endif
|
%endif
|
||||||
# jsoncpp available for openSUSE > 13.2 & Leap
|
|
||||||
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
|
|
||||||
BuildRequires: jsoncpp-devel
|
|
||||||
%endif
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
%if 0%{?suse_version} > 1320
|
|
||||||
%define qtdir %{_lib}/qt5
|
|
||||||
%else
|
|
||||||
%define qtdir %{_lib}/qt4
|
|
||||||
%endif
|
|
||||||
Provides: python3-%{name}-qt = %{version}
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
VTK is a software system for image processing, 3D graphics, volume
|
VTK is a software system for image processing, 3D graphics, volume
|
||||||
@ -137,13 +126,11 @@ Requires: %{name}-tcl = %{version}
|
|||||||
Requires: %{shlib} = %{version}
|
Requires: %{shlib} = %{version}
|
||||||
Requires: Mesa-libGL-devel
|
Requires: Mesa-libGL-devel
|
||||||
Requires: R-base-devel
|
Requires: R-base-devel
|
||||||
|
Requires: freetype2-devel
|
||||||
Requires: gl2ps-devel
|
Requires: gl2ps-devel
|
||||||
Requires: hdf5-devel
|
Requires: hdf5-devel
|
||||||
# jsoncpp available for openSUSE > 13.2 & Leap
|
Requires: hdf5-openmpi-devel
|
||||||
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
|
|
||||||
Requires: jsoncpp-devel
|
Requires: jsoncpp-devel
|
||||||
%endif
|
|
||||||
Requires: freetype2-devel
|
|
||||||
Requires: libexpat-devel
|
Requires: libexpat-devel
|
||||||
Requires: libjpeg-devel
|
Requires: libjpeg-devel
|
||||||
Requires: liblz4-devel
|
Requires: liblz4-devel
|
||||||
@ -255,6 +242,7 @@ This package provides a few testing programs for VTK.
|
|||||||
%setup -q -n VTK-%{version}
|
%setup -q -n VTK-%{version}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
# Replace relative path ../../../VTKData with %%{_datadir}/%%{pkgname}data-%%{version}
|
# Replace relative path ../../../VTKData with %%{_datadir}/%%{pkgname}data-%%{version}
|
||||||
# otherwise it will break on symlinks.
|
# otherwise it will break on symlinks.
|
||||||
@ -268,126 +256,108 @@ if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then
|
|||||||
source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh
|
source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir build
|
|
||||||
pushd build
|
|
||||||
# FindJava.cmake looks for javah executable. However,
|
# FindJava.cmake looks for javah executable. However,
|
||||||
# the build never invokes the tool. Define a bogus
|
# the build never invokes the tool. Define a bogus
|
||||||
# Java_JAVAH_EXECUTABLE in order to be able to build
|
# Java_JAVAH_EXECUTABLE in order to be able to build
|
||||||
# with JDK10 that does not have this tool, deprecated
|
# with JDK10 that does not have this tool, deprecated
|
||||||
# since JDK8.
|
# since JDK8.
|
||||||
cmake .. \
|
%cmake \
|
||||||
-DJava_JAVAH_EXECUTABLE:PATH=%{_bindir}/true\
|
|
||||||
-DCMAKE_CXX_COMPILER:STRING='mpicxx' \
|
|
||||||
-DCMAKE_C_COMPILER:STRING='mpicc' \
|
|
||||||
-DBUILD_DOCUMENTATION:BOOL=ON \
|
-DBUILD_DOCUMENTATION:BOOL=ON \
|
||||||
-DBUILD_EXAMPLES:BOOL=ON \
|
-DBUILD_EXAMPLES:BOOL=ON \
|
||||||
-DBUILD_SHARED_LIBS:BOOL=ON \
|
|
||||||
-DBUILD_TESTING:BOOL=OFF \
|
-DBUILD_TESTING:BOOL=OFF \
|
||||||
-DCMAKE_SKIP_RPATH:BOOL=ON \
|
-DCMAKE_CXX_COMPILER:STRING='mpicxx' \
|
||||||
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
|
-DCMAKE_C_COMPILER:STRING='mpicc' \
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \
|
||||||
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \
|
-DJava_JAVAH_EXECUTABLE:PATH=%{_bindir}/true \
|
||||||
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
|
|
||||||
-DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \
|
|
||||||
-DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{pkgname} \
|
|
||||||
%if 0%{?suse_version} > 1320
|
|
||||||
-DVTK_QT_VERSION=5 \
|
|
||||||
%else
|
|
||||||
-DVTK_QT_VERSION=4 \
|
|
||||||
%endif
|
|
||||||
-DVTK_INSTALL_QT_DIR:STRING=/%{qtdir}/plugins/designer \
|
|
||||||
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \
|
|
||||||
-DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF \
|
|
||||||
-DVTK_EXTERNAL_LIBHARU_IS_SHARED:BOOL=OFF \
|
|
||||||
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
|
|
||||||
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
|
|
||||||
%else
|
|
||||||
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \
|
|
||||||
%endif
|
|
||||||
-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
|
|
||||||
-DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py3_ver}/site-packages \
|
|
||||||
-DVTK_WRAP_PYTHON:BOOL=ON \
|
|
||||||
-DVTK_WRAP_JAVA:BOOL=ON \
|
|
||||||
-DVTK_WRAP_PYTHON_SIP:BOOL=ON \
|
|
||||||
-DVTK_WRAP_TCL:BOOL=ON \
|
|
||||||
-DVTK_Group_MPI:BOOL=ON \
|
|
||||||
-DVTK_Group_Imaging:BOOL=ON \
|
|
||||||
-DVTK_Group_Qt:BOOL=ON \
|
|
||||||
-DModule_vtkTestingCore:BOOL=ON \
|
-DModule_vtkTestingCore:BOOL=ON \
|
||||||
-DModule_vtkTestingRendering:BOOL=ON \
|
-DModule_vtkTestingRendering:BOOL=ON \
|
||||||
|
-DOpenGL_GL_PREFERENCE:STRING='GLVND' \
|
||||||
|
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
|
||||||
|
-DVTK_EXTERNAL_LIBHARU_IS_SHARED:BOOL=OFF \
|
||||||
|
-DVTK_Group_Imaging:BOOL=ON \
|
||||||
|
-DVTK_Group_MPI:BOOL=ON \
|
||||||
|
-DVTK_Group_Qt:BOOL=ON \
|
||||||
-DVTK_Group_Rendering:BOOL=ON \
|
-DVTK_Group_Rendering:BOOL=ON \
|
||||||
-DVTK_Group_StandAlone:BOOL=ON \
|
-DVTK_Group_StandAlone:BOOL=ON \
|
||||||
-DVTK_Group_Tk:BOOL=ON \
|
-DVTK_Group_Tk:BOOL=ON \
|
||||||
-DVTK_Group_Views:BOOL=ON \
|
-DVTK_Group_Views:BOOL=ON \
|
||||||
-DVTK_WRAP_TCL:BOOL=ON \
|
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \
|
||||||
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
|
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
|
||||||
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
|
-DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \
|
||||||
|
-DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py3_ver}/site-packages \
|
||||||
|
-DVTK_INSTALL_QT_DIR:STRING=/%{_lib}/qt5/plugins/designer \
|
||||||
|
-DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{pkgname} \
|
||||||
-DVTK_PYTHON_VERSION=3 \
|
-DVTK_PYTHON_VERSION=3 \
|
||||||
-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \
|
-DVTK_QT_VERSION=5 \
|
||||||
|
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \
|
||||||
|
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
|
||||||
-DVTK_USE_SYSTEM_DIY2=OFF \
|
-DVTK_USE_SYSTEM_DIY2=OFF \
|
||||||
-DVTK_USE_SYSTEM_GL2PS=OFF \
|
-DVTK_USE_SYSTEM_GL2PS=OFF \
|
||||||
-DVTK_USE_SYSTEM_MPI4PY=ON
|
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
|
||||||
|
-DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF \
|
||||||
|
-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
|
||||||
|
-DVTK_USE_SYSTEM_MPI4PY=ON \
|
||||||
|
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
|
||||||
|
-DVTK_WRAP_JAVA:BOOL=ON \
|
||||||
|
-DVTK_WRAP_PYTHON:BOOL=ON \
|
||||||
|
-DVTK_WRAP_PYTHON_SIP:BOOL=ON \
|
||||||
|
-DVTK_WRAP_TCL:BOOL=ON
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%make_jobs
|
||||||
make %{?_smp_mflags} DoxygenDoc
|
make %{?_smp_mflags} DoxygenDoc
|
||||||
|
|
||||||
# Remove executable bits from sources (some of which are generated)
|
# Remove executable bits from sources (some of which are generated)
|
||||||
find . -name \*.c -o -name \*.cxx -o -name \*.h -o -name \*.hxx -o -name \*.gif -exec chmod -x "{}" "+"
|
find . -name \*.c -o -name \*.cxx -o -name \*.h -o -name \*.hxx -o -name \*.gif -exec chmod -x "{}" "+"
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
pushd build
|
%cmake_install
|
||||||
%makeinstall
|
|
||||||
|
|
||||||
# Gather list of non-binding libraries
|
|
||||||
ls %{buildroot}%{_libdir}/lib*.so.* | sed -e's,^%{buildroot},,' > libs.list
|
|
||||||
|
|
||||||
# List of executable examples
|
# List of executable examples
|
||||||
cat > examples.list << EOF
|
cat > examples.list << EOF
|
||||||
Generate2DAMRDataSetWithPulse
|
|
||||||
Generate3DAMRDataSetWithPulse
|
|
||||||
HierarchicalBoxPipeline
|
|
||||||
ImageSlicing
|
|
||||||
DumpXMLFile
|
|
||||||
ParticleReader
|
|
||||||
GenerateCubesFromLabels
|
|
||||||
GenerateModelsFromLabels
|
|
||||||
Medical1
|
|
||||||
Medical2
|
|
||||||
Medical3
|
|
||||||
Medical4
|
|
||||||
Delaunay3D
|
|
||||||
Delaunay3DAlpha
|
|
||||||
finance
|
|
||||||
MultiBlock
|
|
||||||
BandedContours
|
|
||||||
FilledContours
|
|
||||||
TubesWithVaryingRadiusAndColors
|
|
||||||
BalloonWidget
|
|
||||||
Slider
|
|
||||||
Slider2D
|
|
||||||
LabeledMesh
|
|
||||||
Arrays
|
|
||||||
Cube
|
|
||||||
RGrid
|
|
||||||
SGrid
|
|
||||||
AmbientSpheres
|
AmbientSpheres
|
||||||
Cylinder
|
Arrays
|
||||||
DiffuseSpheres
|
BalloonWidget
|
||||||
SpecularSpheres
|
BandedContours
|
||||||
Cone
|
Cone
|
||||||
Cone2
|
Cone2
|
||||||
Cone3
|
Cone3
|
||||||
Cone4
|
Cone4
|
||||||
Cone5
|
Cone5
|
||||||
Cone6
|
Cone6
|
||||||
|
Cube
|
||||||
|
Cylinder
|
||||||
|
Delaunay3D
|
||||||
|
Delaunay3DAlpha
|
||||||
|
DiffuseSpheres
|
||||||
|
DumpXMLFile
|
||||||
|
FilledContours
|
||||||
FixedPointVolumeRayCastMapperCT
|
FixedPointVolumeRayCastMapperCT
|
||||||
GPURenderDemo
|
GPURenderDemo
|
||||||
|
Generate2DAMRDataSetWithPulse
|
||||||
|
Generate3DAMRDataSetWithPulse
|
||||||
|
GenerateCubesFromLabels
|
||||||
|
GenerateModelsFromLabels
|
||||||
|
HierarchicalBoxPipeline
|
||||||
|
ImageSlicing
|
||||||
|
LabeledMesh
|
||||||
|
Medical1
|
||||||
|
Medical2
|
||||||
|
Medical3
|
||||||
|
Medical4
|
||||||
|
MultiBlock
|
||||||
|
ParticleReader
|
||||||
|
RGrid
|
||||||
|
SGrid
|
||||||
|
Slider
|
||||||
|
Slider2D
|
||||||
|
SpecularSpheres
|
||||||
|
TubesWithVaryingRadiusAndColors
|
||||||
|
finance
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Install examples
|
# Install examples
|
||||||
for file in `cat examples.list`; do
|
for file in `cat examples.list`; do
|
||||||
install -p bin/$file %{buildroot}%{_bindir}
|
install -p build/bin/$file %{buildroot}%{_bindir}
|
||||||
done
|
done
|
||||||
perl -pi -e's,^,%{_bindir}/,' examples.list
|
perl -pi -e's,^,%{_bindir}/,' examples.list
|
||||||
|
|
||||||
@ -399,28 +369,22 @@ chrpath -d %{buildroot}%{_bindir}/*
|
|||||||
%post -n %{shlib} -p /sbin/ldconfig
|
%post -n %{shlib} -p /sbin/ldconfig
|
||||||
%postun -n %{shlib} -p /sbin/ldconfig
|
%postun -n %{shlib} -p /sbin/ldconfig
|
||||||
|
|
||||||
%files -n %{shlib} -f build/libs.list
|
%files -n %{shlib}
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
|
%{_libdir}/lib*.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
%doc Copyright.txt
|
|
||||||
%{_bindir}/%{pkgname}EncodeString
|
%{_bindir}/%{pkgname}EncodeString
|
||||||
%{_bindir}/%{pkgname}HashSource
|
%{_bindir}/%{pkgname}HashSource
|
||||||
%{_bindir}/%{pkgname}WrapHierarchy
|
|
||||||
%{_bindir}/%{pkgname}ParseJava
|
%{_bindir}/%{pkgname}ParseJava
|
||||||
|
%{_bindir}/%{pkgname}WrapHierarchy
|
||||||
%{_bindir}/%{pkgname}WrapJava
|
%{_bindir}/%{pkgname}WrapJava
|
||||||
%{_bindir}/%{pkgname}WrapPython
|
%{_bindir}/%{pkgname}WrapPython
|
||||||
%{_bindir}/%{pkgname}WrapPythonInit
|
%{_bindir}/%{pkgname}WrapPythonInit
|
||||||
%{_bindir}/%{pkgname}WrapTcl
|
%{_bindir}/%{pkgname}WrapTcl
|
||||||
%{_bindir}/%{pkgname}WrapTclInit
|
%{_bindir}/%{pkgname}WrapTclInit
|
||||||
%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
|
|
||||||
%{_bindir}/%{pkgname}mkg3states
|
|
||||||
%endif
|
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
|
|
||||||
%{_libdir}/libvtktiff.so
|
|
||||||
%endif
|
|
||||||
%{_libdir}/cmake/%{pkgname}/
|
%{_libdir}/cmake/%{pkgname}/
|
||||||
%{_libdir}/libvtkWrappingTools.a
|
%{_libdir}/libvtkWrappingTools.a
|
||||||
%{_includedir}/%{pkgname}-%{series}/
|
%{_includedir}/%{pkgname}-%{series}/
|
||||||
@ -429,32 +393,32 @@ chrpath -d %{buildroot}%{_bindir}/*
|
|||||||
%exclude %{_datadir}/tcl/vtk/vtktcl.c
|
%exclude %{_datadir}/tcl/vtk/vtktcl.c
|
||||||
|
|
||||||
%files devel-doc
|
%files devel-doc
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
%{_datadir}/doc/%{pkgname}-%{series}/
|
%{_datadir}/doc/%{pkgname}-%{series}/
|
||||||
|
|
||||||
%files java
|
%files java
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
%{_libdir}/%{pkgname}.jar
|
%{_libdir}/%{pkgname}.jar
|
||||||
%{_libdir}/libvtk*Java.so
|
%{_libdir}/libvtk*Java.so
|
||||||
|
|
||||||
%files -n python3-%{name}
|
%files -n python3-%{name}
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
%{_bindir}/%{pkgname}python
|
%{_bindir}/%{pkgname}python
|
||||||
%{_bindir}/p%{pkgname}python
|
%{_bindir}/p%{pkgname}python
|
||||||
%{python3_sitearch}/%{pkgname}/
|
%{python3_sitearch}/%{pkgname}/
|
||||||
|
|
||||||
%files tcl
|
%files tcl
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
%{_bindir}/%{pkgname}
|
%{_bindir}/%{pkgname}
|
||||||
%{_bindir}/p%{pkgname}
|
%{_bindir}/p%{pkgname}
|
||||||
%{_datadir}/tcl/%{pkgname}/
|
%{_datadir}/tcl/%{pkgname}/
|
||||||
|
|
||||||
%files qt
|
%files qt
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
%dir %{_prefix}/%{qtdir}/plugins/designer
|
%dir %{_prefix}/%{_lib}/qt5/plugins/designer
|
||||||
%{_prefix}/%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so
|
%{_prefix}/%{_lib}/qt5/plugins/designer/libQVTKWidgetPlugin.so
|
||||||
|
|
||||||
%files examples -f build/examples.list
|
%files examples -f examples.list
|
||||||
%defattr(-,root,root,-)
|
%license Copyright.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user