Merge pull request #2136 from SpecLad:python-ver

c3bfe3f3 · Roman Donchenko · OpenCV Buildbot · 85c713b5 · 9e3673ef · c3bfe3f3
Commit c3bfe3f3 authored Jan 13, 2014 by Roman Donchenko Committed by OpenCV Buildbot Jan 13, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

OpenCVDetectPython.cmake cmake/OpenCVDetectPython.cmake +2 -1

No files found.
--- 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)