forked from pool/opencv
3a8c3635ad
Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
diff -urN OpenCV-2.4.0-orig/cmake/OpenCVGenConfig.cmake OpenCV-2.4.0/cmake/OpenCVGenConfig.cmake
|
|
--- OpenCV-2.4.0-orig/cmake/OpenCVGenConfig.cmake 2012-04-01 13:08:51.000000000 +0300
|
|
+++ OpenCV-2.4.0/cmake/OpenCVGenConfig.cmake 2012-05-15 14:00:58.331996688 +0300
|
|
@@ -135,7 +135,7 @@
|
|
if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
|
|
set(OPENCV_CONFIG_INSTALL_PREFIX lib${LIB_SUFFIX}/cmake/opencv)
|
|
else()
|
|
- set(OPENCV_CONFIG_INSTALL_PREFIX share/OpenCV)
|
|
+ set(OPENCV_CONFIG_INSTALL_PREFIX share/opencv)
|
|
endif()
|
|
|
|
if(INSTALL_TO_MANGLED_PATHS)
|
|
diff -urN OpenCV-2.4.0-orig/CMakeLists.txt OpenCV-2.4.0/CMakeLists.txt
|
|
--- OpenCV-2.4.0-orig/CMakeLists.txt 2012-04-30 22:40:29.000000000 +0300
|
|
+++ OpenCV-2.4.0/CMakeLists.txt 2012-05-15 13:58:51.100802230 +0300
|
|
@@ -199,7 +199,7 @@
|
|
elseif(INSTALL_TO_MANGLED_PATHS)
|
|
set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
|
|
else()
|
|
- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
|
|
+ set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
|
|
endif()
|
|
|
|
if(ANDROID)
|
|
diff -urN OpenCV-2.4.0-orig/data/CMakeLists.txt OpenCV-2.4.0/data/CMakeLists.txt
|
|
--- OpenCV-2.4.0-orig/data/CMakeLists.txt 2012-04-01 13:10:59.000000000 +0300
|
|
+++ OpenCV-2.4.0/data/CMakeLists.txt 2012-05-15 14:02:40.939237558 +0300
|
|
@@ -2,6 +2,6 @@
|
|
file(GLOB LBP_CASCADES lbpcascades/*.xml)
|
|
|
|
if(NOT WIN32)
|
|
- install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
|
|
- install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
|
|
+ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
|
|
+ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
|
|
endif()
|