From: Andrey Kamaev <andrey.kamaev@itseez.com>
Date: Thu, 6 Sep 2012 10:42:30 +0000 (+0400)
Subject: Disable TBB on Android for mips
X-Git-Tag: accepted/2.0/20130307.220821~364^2~210^2~73
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8767f5fbe3f20ad7ebdbea1772ae497d35075b9;p=profile%2Fivi%2Fopencv.git

Disable TBB on Android for mips
---

diff --git a/cmake/OpenCVDetectTBB.cmake b/cmake/OpenCVDetectTBB.cmake
index 3dba759..fc6a635 100644
--- a/cmake/OpenCVDetectTBB.cmake
+++ b/cmake/OpenCVDetectTBB.cmake
@@ -1,4 +1,4 @@
-if(ANDROID)
+if(ANDROID AND NOT MIPS)
   add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/tbb")
   include_directories(SYSTEM ${TBB_INCLUDE_DIRS})
   set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb)
@@ -21,11 +21,11 @@ elseif(UNIX AND NOT APPLE)
 endif()
 
 if(NOT HAVE_TBB)
-  set(TBB_DEFAULT_INCLUDE_DIRS 
-    "/opt/intel/tbb" "/usr/local/include" "/usr/include" 
-    "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB" 
-    "C:/Program Files (x86)/tbb/include" 
-    "C:/Program Files (x86)/tbb/include" 
+  set(TBB_DEFAULT_INCLUDE_DIRS
+    "/opt/intel/tbb" "/usr/local/include" "/usr/include"
+    "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB"
+    "C:/Program Files (x86)/tbb/include"
+    "C:/Program Files (x86)/tbb/include"
     "${CMAKE_INSTALL_PREFIX}/include")
 
   find_path(TBB_INCLUDE_DIRS "tbb/tbb.h" PATHS ${TBB_INCLUDE_DIR} ${TBB_DEFAULT_INCLUDE_DIRS} DOC "The path to TBB headers")