potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 'master' into python2and3

Browse Source
This commit is contained in:
arc
2014-08-07 01:01:11 -04:00
parent e9ccadebed 0428ce4703
commit 3d0a270a66
149 changed files with 926 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/CMakeLists.txt
+3 -1
View File
@@ -2,7 +2,9 @@
# CMake file for python support
# ----------------------------------------------------------------------------
if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
if((WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
OR BUILD_opencv_world
)
ocv_module_disable(python2)
ocv_module_disable(python3)
endif()