mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-25 10:03:03 +01:00
101 lines
5 KiB
Diff
101 lines
5 KiB
Diff
diff -Naur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
|
|
--- opencv-2.4.7.orig/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
|
+++ opencv-2.4.7/CMakeLists.txt 2013-11-12 10:30:39.179852725 +0100
|
|
@@ -243,9 +243,9 @@
|
|
if(ANDROID OR WIN32)
|
|
set(OPENCV_DOC_INSTALL_PATH doc)
|
|
elseif(INSTALL_TO_MANGLED_PATHS)
|
|
- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
|
|
+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
|
|
else()
|
|
- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
|
|
+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
|
|
endif()
|
|
|
|
if(WIN32)
|
|
@@ -282,7 +282,7 @@
|
|
set(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
|
|
else()
|
|
set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
|
|
- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
|
|
+ set(OPENCV_3P_LIB_INSTALL_PATH share/Opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
|
|
endif()
|
|
set(OPENCV_INCLUDE_INSTALL_PATH "include")
|
|
|
|
@@ -290,7 +290,7 @@
|
|
if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
|
|
set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
|
|
else()
|
|
- set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
|
|
+ set(OPENCV_CONFIG_INSTALL_PATH share/Opencv)
|
|
endif()
|
|
endif()
|
|
|
|
diff -Naur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
|
|
--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-06 15:26:39.000000000 +0100
|
|
+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 10:25:51.071843495 +0100
|
|
@@ -46,7 +46,7 @@
|
|
|
|
#need better solution....
|
|
if(libpath MATCHES "3rdparty")
|
|
- set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
|
|
+ set(installDir "share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
|
|
else()
|
|
set(installDir "${OPENCV_LIB_INSTALL_PATH}")
|
|
endif()
|
|
diff -Naur opencv-2.4.7.orig/data/CMakeLists.txt opencv-2.4.7/data/CMakeLists.txt
|
|
--- opencv-2.4.7.orig/data/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
|
+++ opencv-2.4.7/data/CMakeLists.txt 2013-11-12 10:25:51.072843495 +0100
|
|
@@ -5,6 +5,6 @@
|
|
install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
|
|
install(FILES ${LBP_CASCADES} DESTINATION sdk/etc/lbpcascades COMPONENT main)
|
|
elseif(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()
|
|
diff -Naur opencv-2.4.7.orig/samples/c/CMakeLists.txt opencv-2.4.7/samples/c/CMakeLists.txt
|
|
--- opencv-2.4.7.orig/samples/c/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
|
+++ opencv-2.4.7/samples/c/CMakeLists.txt 2013-11-12 10:25:51.072843495 +0100
|
|
@@ -54,6 +54,6 @@
|
|
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
|
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
|
install(FILES ${C_SAMPLES}
|
|
- DESTINATION share/OpenCV/samples/c
|
|
+ DESTINATION share/opencv/samples/c
|
|
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
|
endif ()
|
|
diff -Naur opencv-2.4.7.orig/samples/cpp/CMakeLists.txt opencv-2.4.7/samples/cpp/CMakeLists.txt
|
|
--- opencv-2.4.7.orig/samples/cpp/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
|
+++ opencv-2.4.7/samples/cpp/CMakeLists.txt 2013-11-12 10:25:51.072843495 +0100
|
|
@@ -83,6 +83,6 @@
|
|
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
|
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
|
install(FILES ${C_SAMPLES}
|
|
- DESTINATION share/OpenCV/samples/cpp
|
|
+ DESTINATION share/opencv/samples/cpp
|
|
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
|
endif()
|
|
diff -Naur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt
|
|
--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
|
+++ opencv-2.4.7/samples/gpu/CMakeLists.txt 2013-11-12 10:25:51.073843495 +0100
|
|
@@ -83,6 +83,6 @@
|
|
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
|
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
|
install(FILES ${install_list}
|
|
- DESTINATION share/OpenCV/samples/${project}
|
|
+ DESTINATION share/opencv/samples/${project}
|
|
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
|
endif()
|
|
diff -Naur opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt opencv-2.4.7/samples/gpu/performance/CMakeLists.txt
|
|
--- opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
|
+++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt 2013-11-12 10:25:51.073843495 +0100
|
|
@@ -29,6 +29,6 @@
|
|
if(INSTALL_C_EXAMPLES AND NOT WIN32)
|
|
file(GLOB GPU_FILES performance/*.cpp performance/*.h)
|
|
install(FILES ${GPU_FILES}
|
|
- DESTINATION share/OpenCV/samples/gpu/performance
|
|
+ DESTINATION share/opencv/samples/gpu/performance
|
|
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
|
endif()
|