From 9e3673ef538916d2f6be0e4def4ca4b3a0fa886a Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Fri, 10 Jan 2014 18:40:47 +0400 Subject: [PATCH] Don't use PYTHON_VERSION_STRING when searching for Python libraries It may be an arbitrary string, and, for example, in Ubuntu 13.10 it's set to "2.7.5+", which breaks the find script. --- cmake/OpenCVDetectPython.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake index 7f258dc25..4f7b679cb 100644 --- a/cmake/OpenCVDetectPython.cmake +++ b/cmake/OpenCVDetectPython.cmake @@ -24,7 +24,8 @@ if(PYTHONINTERP_FOUND) if(NOT ANDROID AND NOT IOS) ocv_check_environment_variables(PYTHON_LIBRARY PYTHON_INCLUDE_DIR) - find_host_package(PythonLibs "${PYTHON_VERSION_STRING}" EXACT) + # not using PYTHON_VERSION_STRING here, because it might not conform to the CMake version format + find_host_package(PythonLibs "${PYTHON_VERSION_MAJOR_MINOR}.${PYTHON_VERSION_PATCH}" EXACT) endif() if(NOT ANDROID AND NOT IOS)