rpms/vtk
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add cmake28 usage when building for EL6

Browse source
This commit is contained in:
Jonathan G. Underwood 2012-05-15 00:32:49 +01:00
commit ca9d984903
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vtk.spec
View file

@ -7,7 +7,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: 5.8.0 Version: 5.8.0
Release: 5%{?dist} Release: 6%{?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
@ -21,7 +21,12 @@ Patch5: vtk-5.6.1-system.patch
URL: http://vtk.org/ URL: http://vtk.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%if (0%{?rhel} <= 6)
BuildRequires: cmake28
%else
BuildRequires: cmake BuildRequires: cmake
%endif
BuildRequires: gcc-c++ BuildRequires: gcc-c++
#%{?with_java:BuildRequires: gcc-java, libgcj-devel, java-devel} #%{?with_java:BuildRequires: gcc-java, libgcj-devel, java-devel}
%{?with_java:BuildRequires: java-devel} %{?with_java:BuildRequires: java-devel}
@ -153,7 +158,11 @@ export JAVA_HOME=/usr/lib/jvm/java
mkdir build mkdir build
pushd build pushd build
%if (0%{?rhel} <= 6)
%{cmake28} .. \
%else
%{cmake} .. \ %{cmake} .. \
%endif
-DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_TESTING:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \
@ -390,6 +399,9 @@ rm -rf %{buildroot}
%doc vtk-examples/Examples %doc vtk-examples/Examples
%changelog %changelog
* Tue May 15 2012 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 5.8.0-6
- Add cmake28 usage when building for EL6
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.8.0-5 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.8.0-5
- Rebuilt for c++ ABI breakage - Rebuilt for c++ ABI breakage