From: Andrey Kamaev <no@email>
Date: Mon, 27 Feb 2012 12:49:00 +0000 (+0000)
Subject: Minor improvement for Android TBB
X-Git-Tag: accepted/2.0/20130307.220821~1244
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=212ceb3e248e3bdb3f5f9013fbc3c4b02e897ba6;p=profile%2Fivi%2Fopencv.git

Minor improvement for Android TBB
---

diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
index 610a53a..0c6105a 100644
--- a/cmake/OpenCVGenConfig.cmake
+++ b/cmake/OpenCVGenConfig.cmake
@@ -87,6 +87,11 @@ foreach(m ${OPENCV_MODULES_BUILD})
   endif()
 endforeach()
 
+if(ANDROID AND NOT BUILD_SHARED_LIBS AND HAVE_TBB)
+  #export TBB headers location because static linkage of TBB might be troublesome if application wants to use TBB itself
+  list(APPEND OpenCV2_INCLUDE_DIRS_CONFIGCMAKE ${TBB_INCLUDE_DIRS})
+endif()
+
 configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" IMMEDIATE @ONLY)
 #support for version checking when finding opencv. find_package(OpenCV 2.3.1 EXACT) should now work.
 configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)