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/OpenCVPCHSupport.cmake
+++ b/OpenCVPCHSupport.cmake
@@ -34,6 +34,10 @@ ELSE()
 	ENDIF()
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)

+#if (ANDROID)
+  #SET(PCHSupport_FOUND FALSE)
+#endif()
+

 MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)