From 1a81da012d3cd1235d2f40a3c787bc6e24d2626c Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri, 23 Aug 2013 18:24:02 +0400
Subject: [PATCH] Removed old Python detection cruft.
None of this should be relevant as of CMake 2.8.7.
---
CMakeLists.txt | 4 ++--
cmake/OpenCVDetectPython.cmake | 32 ++++----------------------------
2 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a24ba1af7..db1b685c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -807,12 +807,12 @@ endif()
# ========================== python ==========================
status("")
status(" Python:")
-status(" Interpreter:" PYTHON_EXECUTABLE THEN "${PYTHON_EXECUTABLE} (ver ${PYTHON_VERSION_FULL})" ELSE NO)
+status(" Interpreter:" PYTHONINTERP_FOUND THEN "${PYTHON_EXECUTABLE} (ver ${PYTHON_VERSION_STRING})" ELSE NO)
if(BUILD_opencv_python)
if(PYTHONLIBS_VERSION_STRING)
status(" Libraries:" HAVE_opencv_python THEN "${PYTHON_LIBRARIES} (ver ${PYTHONLIBS_VERSION_STRING})" ELSE NO)
else()
- status(" Libraries:" HAVE_opencv_python THEN ${PYTHON_LIBRARIES} ELSE NO)
+ status(" Libraries:" HAVE_opencv_python THEN "${PYTHON_LIBRARIES}" ELSE NO)
endif()
status(" numpy:" PYTHON_NUMPY_INCLUDE_DIR THEN "${PYTHON_NUMPY_INCLUDE_DIR} (ver ${PYTHON_NUMPY_VERSION})" ELSE "NO (Python wrappers can not be generated)")
status(" packages path:" PYTHON_EXECUTABLE THEN "${PYTHON_PACKAGES_PATH}" ELSE "-")
diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
index 777f820bd..ca693e701 100644
--- a/cmake/OpenCVDetectPython.cmake
+++ b/cmake/OpenCVDetectPython.cmake
@@ -15,36 +15,12 @@ endif()
find_host_package(PythonInterp 2.0)
unset(HAVE_SPHINX CACHE)
-if(PYTHON_EXECUTABLE)
- if(PYTHON_VERSION_STRING)
- set(PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
- set(PYTHON_VERSION_FULL "${PYTHON_VERSION_STRING}")
- else()
- execute_process(COMMAND ${PYTHON_EXECUTABLE} --version
- ERROR_VARIABLE PYTHON_VERSION_FULL
- ERROR_STRIP_TRAILING_WHITESPACE)
- string(REGEX MATCH "[0-9]+.[0-9]+" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- endif()
-
- if("${PYTHON_VERSION_FULL}" MATCHES "[0-9]+.[0-9]+.[0-9]+")
- set(PYTHON_VERSION_FULL "${CMAKE_MATCH_0}")
- elseif("${PYTHON_VERSION_FULL}" MATCHES "[0-9]+.[0-9]+")
- set(PYTHON_VERSION_FULL "${CMAKE_MATCH_0}")
- else()
- unset(PYTHON_VERSION_FULL)
- endif()
+if(PYTHONINTERP_FOUND)
+ set(PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
if(NOT ANDROID AND NOT IOS)
- if(CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL)
- find_host_package(PythonLibs ${PYTHON_VERSION_FULL} EXACT)
- else()
- find_host_package(PythonLibs ${PYTHON_VERSION_FULL})
- endif()
- # cmake 2.4 (at least on Ubuntu 8.04 (hardy)) don't define PYTHONLIBS_FOUND
- if(NOT PYTHONLIBS_FOUND AND PYTHON_INCLUDE_PATH)
- set(PYTHONLIBS_FOUND ON)
- endif()
+ find_host_package(PythonLibs "${PYTHON_VERSION_STRING}" EXACT)
endif()
if(NOT ANDROID AND NOT IOS)
@@ -113,4 +89,4 @@ if(PYTHON_EXECUTABLE)
endif()
endif()
endif(BUILD_DOCS)
-endif(PYTHON_EXECUTABLE)
+endif()