File opencv-samples.patch of Package opencv

Overview Repositories Revisions Requests Users Attributes Meta

File opencv-samples.patch of Package opencv (Revision 03aa2ca8f72503a55aa8f3df128663ed)

Currently displaying revision 03aa2ca8f72503a55aa8f3df128663ed , Show latest

diff -urN OpenCV-2.4.3-orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
--- OpenCV-2.4.3-orig/CMakeLists.txt	2012-11-02 17:04:07.000000000 +0200
+++ OpenCV-2.4.3/CMakeLists.txt	2012-11-28 12:01:07.942804657 +0200
@@ -455,7 +455,7 @@
 add_subdirectory(apps)
 
 # examples
-if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
   add_subdirectory(samples)
 endif()
 
diff -urN OpenCV-2.4.3-orig/samples/CMakeLists.txt OpenCV-2.4.3/samples/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/CMakeLists.txt	2012-08-09 01:55:05.000000000 +0300
+++ OpenCV-2.4.3/samples/CMakeLists.txt	2012-11-28 12:01:07.943804624 +0200
@@ -3,6 +3,7 @@
 #
 # ----------------------------------------------------------------------------
 
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES)
 add_subdirectory(c)
 add_subdirectory(cpp)
 add_subdirectory(gpu)
@@ -11,3 +12,9 @@
 if(ANDROID AND BUILD_ANDROID_EXAMPLES)
   add_subdirectory(android)
 endif()
+endif()
+
+if(INSTALL_PYTHON_EXAMPLES)
+add_subdirectory(python)
+add_subdirectory(python2)
+endif()
diff -urN OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt	2012-10-18 01:55:38.000000000 +0300
+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt	2012-11-28 12:01:07.943804624 +0200
@@ -64,7 +64,7 @@
 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/gpu
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 endif()
 
diff -urN OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.3/samples/ocl/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt	2012-10-18 01:55:38.000000000 +0300
+++ OpenCV-2.4.3/samples/ocl/CMakeLists.txt	2012-11-28 13:16:24.943465391 +0200
@@ -58,7 +58,7 @@
 if (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/ocl
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 endif()
 
diff -urN OpenCV-2.4.3-orig/samples/python/CMakeLists.txt OpenCV-2.4.3/samples/python/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/python/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.3/samples/python/CMakeLists.txt	2012-11-28 12:01:07.943804624 +0200
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+#  CMake file for Python samples. See root CMakeLists.txt
+# -------------------------------------------------------------------------
+
+file(GLOB PYTHON_SAMPLES *.py)
+if(NOT WIN32)
+install(FILES ${PYTHON_SAMPLES}
+        DESTINATION share/OpenCV/samples/python
+        PERMISSIONS OWNER_READ OWNER_EXECUTE
+                    GROUP_READ GROUP_EXECUTE
+                    WORLD_READ WORLD_EXECUTE)
+endif()
diff -urN OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt OpenCV-2.4.3/samples/python2/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.3/samples/python2/CMakeLists.txt	2012-11-28 12:01:07.943804624 +0200
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+#  CMake file for Python samples. See root CMakeLists.txt
+# -------------------------------------------------------------------------
+
+file(GLOB PYTHON_SAMPLES *.py)
+if(NOT WIN32)
+install(FILES ${PYTHON_SAMPLES}
+        DESTINATION share/OpenCV/samples/python2
+        PERMISSIONS OWNER_READ OWNER_EXECUTE
+                    GROUP_READ GROUP_EXECUTE
+                    WORLD_READ WORLD_EXECUTE)
+endif()

Places

File opencv-samples.patch of Package opencv (Revision 03aa2ca8f72503a55aa8f3df128663ed)

Places