Merge pull request #1887 from jet47:android-cuda-6.0

2013-12-02 18:53:26 +04:00
parent f7f194e5dd fc1d38ced8
commit 790f53f12a
5 changed files with 35 additions and 13 deletions
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(ANDROID OR IOS)
+if(IOS)
  ocv_module_disable(gpu)
 endif()