[libfreenect/el6] el6 should use cmake28

rmattes rmattes at fedoraproject.org
Mon Sep 3 01:37:58 UTC 2012


commit c823988c3309499a00ee0217cf5768e45a9fbcab
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Sep 2 21:37:10 2012 -0400

    el6 should use cmake28

 libfreenect.spec |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/libfreenect.spec b/libfreenect.spec
index 23aed62..3a11c2a 100644
--- a/libfreenect.spec
+++ b/libfreenect.spec
@@ -14,8 +14,11 @@ URL:            http://www.openkinect.org/
 # Usage: freenect_generate_tarball.sh [GIT TAG]
 Source0:        libfreenect-v%{version}.tar.bz2
 Source1:        freenect_generate_tarball.sh
-
+%if 0%{?rhel}
+BuildRequires:  cmake28
+%else
 BuildRequires:  cmake
+%endif
 BuildRequires:  Cython
 BuildRequires:  doxygen
 BuildRequires:  freeglut-devel
@@ -88,7 +91,20 @@ sed -i 's|set(CMAKE_C_FLAGS "-Wall")|#set(CMAKE_C_FLAGS "-Wall")|' examples/CMak
 %build
 mkdir build
 pushd build
-%cmake -DBUILD_AUDIO=ON -DBUILD-CPP=ON -DBUILD_C_SYNC=ON -DBUILD_CV=ON -DBUILD_REDIST_PACKAGE=ON -DBUILD_EXAMPLES=ON -DBUILD_CPACK=OFF -DBUILD_FAKENECT=ON -DBUILD_PYTHON=ON ..
+%if 0%{?rhel}
+%cmake28 \
+%else
+%cmake \
+%endif
+  -DBUILD_AUDIO=ON \
+  -DBUILD-CPP=ON \
+  -DBUILD_C_SYNC=ON \
+  -DBUILD_CV=ON \
+  -DBUILD_REDIST_PACKAGE=ON \
+  -DBUILD_EXAMPLES=ON \
+  -DBUILD_CPACK=OFF \
+  -DBUILD_FAKENECT=ON \
+  -DBUILD_PYTHON=ON ..
 make %{?_smp_mflags} VERBOSE=1
 popd
 


More information about the scm-commits mailing list