From 574a961cc1cf9249f1551eda8366e8eb2797b768 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 12 Aug 2011 18:00:35 +0000 Subject: [PATCH] added cv.py micro-module for backward compatibility with existing Python scripts using prev-gen Python API. --- modules/python/CMakeLists.txt | 18 +++++++++--------- modules/python/src2/cv.py | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 modules/python/src2/cv.py diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt index 196c99f9e7..d9ea987e61 100644 --- a/modules/python/CMakeLists.txt +++ b/modules/python/CMakeLists.txt @@ -81,14 +81,14 @@ endif() set(cvpymodules ${cv2_target}) if(WIN32) - install(TARGETS ${cvpymodules} - RUNTIME DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main - LIBRARY DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main - ARCHIVE DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main - ) + set(CVPY_PATH "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages") else() - install(TARGETS ${cvpymodules} - RUNTIME DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT main - LIBRARY DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT main - ARCHIVE DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT main) + set(CVPY_PATH ${PYTHON_PACKAGES_PATH}) endif() + +install(TARGETS ${cvpymodules} + RUNTIME DESTINATION ${CVPY_PATH} COMPONENT main + LIBRARY DESTINATION ${CVPY_PATH} COMPONENT main + ARCHIVE DESTINATION ${CVPY_PATH} COMPONENT main + ) +install(FILES src2/cv.py DESTINATION ${CVPY_PATH} COMPONENT main) diff --git a/modules/python/src2/cv.py b/modules/python/src2/cv.py new file mode 100644 index 0000000000..2d4daf08b0 --- /dev/null +++ b/modules/python/src2/cv.py @@ -0,0 +1 @@ +from cv2.cv import * -- GitLab