Fixed tbb hang in Android apps

2012-02-29 08:11:01 +00:00
parent d05b788db4
commit 4b5d04f475
3 changed files with 42 additions and 28 deletions
--- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake
@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    # Profiling?
    if(ENABLE_PROFILING)
        set(OPENCV_EXTRA_C_FLAGS_RELEASE "${OPENCV_EXTRA_C_FLAGS_RELEASE} -pg -g")
-    elseif(NOT APPLE)
+    elseif(NOT APPLE AND NOT ANDROID)
        # Remove unreferenced functions: function level linking
        set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -ffunction-sections")
    endif()