Merge pull request #5821 from alalek:build_framework

This commit is contained in:
Vadim Pisarevsky
2015-12-18 10:12:55 +00:00
12 changed files with 131 additions and 206 deletions

View File

@@ -9,7 +9,7 @@ if((WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
ocv_module_disable(python3)
endif()
if(ANDROID OR IOS OR WINRT)
if(ANDROID OR APPLE_FRAMEWORK OR WINRT)
ocv_module_disable(python2)
ocv_module_disable(python3)
endif()