ca20cb32d4
- Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
16 lines
1.1 KiB
Diff
16 lines
1.1 KiB
Diff
diff -urN OpenCV-2.3.1-orig/CMakeLists.txt OpenCV-2.3.1/CMakeLists.txt
|
|
--- OpenCV-2.3.1-orig/CMakeLists.txt 2011-08-17 22:42:55.000000000 +0300
|
|
+++ OpenCV-2.3.1/CMakeLists.txt 2011-08-19 13:40:08.785540389 +0300
|
|
@@ -665,9 +665,9 @@
|
|
OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
|
|
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
|
|
+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
|
|
else() #debian based assumed, install to the dist-packages.
|
|
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
|
|
+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
|
|
endif()
|
|
endif()
|
|
if(CMAKE_HOST_WIN32)
|