[pcl/el6] Fixes for el6: Disable openni Use cmake28

rmattes rmattes at fedoraproject.org
Sun Oct 14 23:25:10 UTC 2012


commit 7bcfc300b5e161393282267e106b05f7241aa3e3
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Oct 14 19:23:56 2012 -0400

    Fixes for el6:
      Disable openni
      Use cmake28

 pcl.spec |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/pcl.spec b/pcl.spec
index fe3df8e..7708c17 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -12,7 +12,12 @@ Patch1:         pcl-1.5.1-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For plain building
-BuildRequires:  cmake, gcc-c++, boost-devel
+%if 0%{?rhel}
+BuildRequires:  cmake28
+%else
+BuildRequires:  cmake
+%endif
+BuildRequires:  gcc-c++, boost-devel
 # Documentation
 BuildRequires:  doxygen, graphviz, python-sphinx
 %if ! 0%{?rhel} || 0%{?rhel} >= 6
@@ -25,9 +30,13 @@ BuildRequires:  tetex-latex
 BuildRequires:  eigen3-devel, flann-devel, cminpack-devel, vtk-devel, gl2ps-devel
 # optional
 BuildRequires:  qhull-devel, libusb1-devel, gtest-devel qtwebkit-devel
+# openni is only available on x86 platforms
+# the el6 version of openni is currently incompatible with pcl
 %ifarch %{ix86} x86_64
+%if ! 0%{?rhel}
 BuildRequires:  openni-devel
 %endif
+%endif
 
 %description
 The Point Cloud Library (or PCL) is a large scale, open project for point
@@ -82,7 +91,11 @@ rm -rf  3rdparty
 %build
 mkdir build
 pushd build
+%if 0%{?rhel}
+%cmake28 \
+%else
 %cmake \
+%endif
   -DCMAKE_BUILD_TYPE=NONE \
   -DOPENNI_INCLUDE_DIR:PATH=/usr/include/ni \
   -DLIB_INSTALL_DIR=$(echo %{_libdir} | sed -e 's|%{_prefix}/||') \
@@ -185,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 14 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-2
+- Use cmake28 on el6
+- Disable openni on el6 for now
+
 * Tue Sep 25 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-2
 - Disabled march=native flag in PCLConfig.cmake
 


More information about the scm-commits mailing list