parent
e8192f16d2
commit
cb0c4f1307
|
@ -0,0 +1,32 @@
|
||||||
|
diff -up VTK-6.1.0/CMake/vtkModuleTop.cmake.install-prefix VTK-6.1.0/CMake/vtkModuleTop.cmake
|
||||||
|
--- VTK-6.1.0/CMake/vtkModuleTop.cmake.install-prefix 2015-07-13 15:00:52.538379740 -0600
|
||||||
|
+++ VTK-6.1.0/CMake/vtkModuleTop.cmake 2015-07-13 15:03:30.197677726 -0600
|
||||||
|
@@ -304,14 +304,26 @@ configure_file(CMake/VTKConfig.cmake.in
|
||||||
|
# Generate VTKConfig.cmake for the install tree.
|
||||||
|
set(VTK_CONFIG_CODE "
|
||||||
|
# Compute the installation prefix from this VTKConfig.cmake file location.
|
||||||
|
-get_filename_component(VTK_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
|
||||||
|
+set(_vtk_installed_prefix \"${CMAKE_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}\")
|
||||||
|
+set(_vtk_requested_prefix \"\${CMAKE_CURRENT_LIST_DIR}\")
|
||||||
|
+get_filename_component(_vtk_installed_prefix_full \"\${_vtk_installed_prefix}\" REALPATH)
|
||||||
|
+get_filename_component(_vtk_requested_prefix_full \"\${_vtk_requested_prefix}\" REALPATH)
|
||||||
|
+if (_vtk_installed_prefix_full STREQUAL _vtk_requested_prefix_full)
|
||||||
|
+ set(VTK_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")
|
||||||
|
+else ()
|
||||||
|
+ set(VTK_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}\")")
|
||||||
|
+
|
||||||
|
# Construct the proper number of get_filename_component(... PATH)
|
||||||
|
# calls to compute the installation prefix.
|
||||||
|
string(REGEX REPLACE "/" ";" _count "${VTK_INSTALL_PACKAGE_DIR}")
|
||||||
|
foreach(p ${_count})
|
||||||
|
set(VTK_CONFIG_CODE "${VTK_CONFIG_CODE}
|
||||||
|
-get_filename_component(VTK_INSTALL_PREFIX \"\${VTK_INSTALL_PREFIX}\" PATH)")
|
||||||
|
+ get_filename_component(VTK_INSTALL_PREFIX \"\${VTK_INSTALL_PREFIX}\" PATH)")
|
||||||
|
endforeach(p)
|
||||||
|
+
|
||||||
|
+set(VTK_CONFIG_CODE "${VTK_CONFIG_CODE}
|
||||||
|
+endif ()")
|
||||||
|
+
|
||||||
|
set(VTK_CONFIG_CODE "${VTK_CONFIG_CODE}
|
||||||
|
set(VTK_MODULES_DIR \"\${VTK_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}/Modules\")")
|
||||||
|
set(VTK_CONFIG_CMAKE_DIR "\${VTK_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}")
|
10
vtk.spec
10
vtk.spec
|
@ -9,7 +9,7 @@
|
||||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||||
Name: vtk
|
Name: vtk
|
||||||
Version: 6.1.0
|
Version: 6.1.0
|
||||||
Release: 27%{?dist}
|
Release: 28%{?dist}
|
||||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||||
# For all intents, it has the same rights and restrictions as BSD.
|
# For all intents, it has the same rights and restrictions as BSD.
|
||||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||||
|
@ -33,7 +33,9 @@ Patch4: vtk-type.patch
|
||||||
# Fix tcl library loading
|
# Fix tcl library loading
|
||||||
# http://www.vtk.org/Bug/view.php?id=15279
|
# http://www.vtk.org/Bug/view.php?id=15279
|
||||||
Patch5: vtk-tcllib.patch
|
Patch5: vtk-tcllib.patch
|
||||||
|
# Fix VTK_INSTALL_PREFIX - backport from upstream
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1228881
|
||||||
|
Patch6: vtk-install-prefix.patch
|
||||||
URL: http://vtk.org/
|
URL: http://vtk.org/
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
|
@ -194,6 +196,7 @@ programming languages.
|
||||||
%patch3 -p1 -b .glext
|
%patch3 -p1 -b .glext
|
||||||
%patch4 -p1 -b .type
|
%patch4 -p1 -b .type
|
||||||
%patch5 -p1 -b .tcllib
|
%patch5 -p1 -b .tcllib
|
||||||
|
%patch6 -p1 -b .install-prefix
|
||||||
# Remove included thirdparty sources just to be sure
|
# Remove included thirdparty sources just to be sure
|
||||||
# TODO - vtksqlite
|
# TODO - vtksqlite
|
||||||
for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope
|
for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope
|
||||||
|
@ -465,6 +468,9 @@ cp -pr --parents Wrapping/*/README* _docs/
|
||||||
%doc vtk-examples/Examples
|
%doc vtk-examples/Examples
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 13 2015 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-28
|
||||||
|
- Add patch to fix VTK_INSTALL_PREFIX (bug #1228881)
|
||||||
|
|
||||||
* Sat May 23 2015 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-27
|
* Sat May 23 2015 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-27
|
||||||
- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512)
|
- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue