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

Merged the trunk r8324:8345

Browse Source
This commit is contained in:
Andrey Kamaev
2012-05-18 12:59:40 +00:00
parent aebed446b1
commit 70166820ea
9 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVDetectPython.cmake
+1 -1
View File
@@ -20,8 +20,8 @@ unset(HAVE_SPHINX CACHE)
if(PYTHON_EXECUTABLE)
if(PYTHON_VERSION_STRING)
set(PYTHON_VERSION_FULL "${PYTHON_VERSION_STRING}")
set(PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" PYTHON_VERSION_FULL "${PYTHON_VERSION_STRING}")
else()
execute_process(COMMAND ${PYTHON_EXECUTABLE} --version
ERROR_VARIABLE PYTHON_VERSION_FULL