Merged android-experimental branch back to trunk.

2011-04-06 14:31:03 +00:00
parent bbdd0aecbd
commit 68534d70f3
120 changed files with 3483 additions and 1620 deletions
--- a/3rdparty/lapack/CMakeLists.txt
+++ b/3rdparty/lapack/CMakeLists.txt
@@ -2,9 +2,6 @@
 #  CMake file for opencv_lapack. See root CMakeLists.txt
 #
 # ----------------------------------------------------------------------------
-if(ANDROID)
-define_3rdparty_module(opencv_lapack)
-else()

 project(opencv_lapack)

@@ -65,5 +62,3 @@ if(NOT BUILD_SHARED_LIBS)
    install(TARGETS ${the_target}
 	    ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main)
 endif()
-    
-endif() #android