generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into python2and3

Browse Source
This commit is contained in:
Michael Pratt
2014-07-31 01:11:30 -04:00
committed by arc
parent cac1218eef 1a1097ab23
commit c9876c3cd8
453 changed files with 11931 additions and 14708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/python/python3/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ if(NOT PYTHON3LIBS_FOUND OR NOT PYTHON3_NUMPY_INCLUDE_DIRS)
endif()
set(the_description "The python3 bindings")
ocv_add_module(python3 BINDINGS opencv_core opencv_flann opencv_imgproc opencv_video opencv_ml opencv_features2d opencv_highgui opencv_calib3d opencv_photo opencv_objdetect OPTIONAL opencv_nonfree)
set(MODULE_NAME python3)
set(PYTHON_INCLUDE_PATH ${PYTHON3_INCLUDE_PATH})
set(PYTHON_NUMPY_INCLUDE_PATH ${PYTHON3_NUMPY_INCLUDE_PATH})
@@ -16,6 +16,7 @@ set(PYTHON_VERSION_MINOR ${PYTHON3_VERSION_MINOR})
include(../common.cmake)
unset(MODULE_NAME)
unset(PYTHON_INCLUDE_PATH)
unset(PYTHON_NUMPY_INCLUDE_PATH)
unset(PYTHON_EXECUTABLE)