r46242 - /packages/opencv/trunk/debian/rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed Sep  4 00:50:03 2013
New Revision: 46242

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46242
Log:
Move configuration for 1394 and V4L to CMAKE_ARCH_FLAGS

build 1394 and v4l support only on Linux; the v4l support would be
detected and enabled on kFreeBSD, but the actual implementation seems
Linux-specific.
Thnaks for Pino Toscano.


Modified:
    packages/opencv/trunk/debian/rules

Modified: packages/opencv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/rules?rev=46242&op=diff
==============================================================================
--- packages/opencv/trunk/debian/rules	(original)
+++ packages/opencv/trunk/debian/rules	Wed Sep  4 00:50:03 2013
@@ -3,6 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie,+fortify
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 # SSE options
 ifeq ($(DEB_HOST_ARCH),amd64)
@@ -16,6 +17,13 @@
 CMAKE_ARCH_FLAGS += -DWITH_TBB=ON
 else
 CMAKE_ARCH_FLAGS += -DWITH_TBB=OFF
+endif
+
+# Linux-specific stuff
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+CMAKE_ARCH_FLAGS += -DWITH_1394=ON -DWITH_V4L=ON
+else
+CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF
 endif
 
 CMAKE_FLAGS = \
@@ -42,8 +50,6 @@
 	-DWITH_OPENEXR=ON \
 	-DWITH_PVAPI=ON	\
 	-DWITH_UNICAP=OFF	\
-	-DWITH_1394=ON	\
-	-DWITH_V4L=ON	\
 	-DWITH_EIGEN=ON \
 	-DWITH_XINE=OFF	\
 	-DBUILD_TESTS=OFF \