forked from pool/opencv
36 lines
1.8 KiB
Diff
36 lines
1.8 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 15:14:51.227242178 +0300
|
||
|
|
@@ -125,7 +125,7 @@
|
||
|
|
elseif(OPENCV_MANGLED_INSTALL_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)
|
||
|
|
@@ -1370,8 +1370,8 @@
|
||
|
|
install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
|
||
|
|
install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
|
||
|
|
else()
|
||
|
|
- install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
|
||
|
|
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
|
||
|
|
+ install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
|
||
|
|
+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
diff -urN OpenCV-2.3.1-orig/data/CMakeLists.txt OpenCV-2.3.1/data/CMakeLists.txt
|
||
|
|
--- OpenCV-2.3.1-orig/data/CMakeLists.txt 2011-08-02 15:48:41.000000000 +0300
|
||
|
|
+++ OpenCV-2.3.1/data/CMakeLists.txt 2011-08-19 15:13:34.349553000 +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()
|