File opencv-2.2-samples.patch of Package opencv

File opencv-2.2-samples.patch of Package opencv (Revision 2)

Currently displaying revision 2, show latest

diff -urN OpenCV-2.2.0-orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
--- OpenCV-2.2.0-orig/CMakeLists.txt	2010-12-05 05:35:23.000000000 +0200
+++ OpenCV-2.2.0/CMakeLists.txt	2010-12-23 18:39:50.649066635 +0200
@@ -1261,7 +1261,7 @@
 add_subdirectory(doc)
 add_subdirectory(data)
 
-if(BUILD_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
     add_subdirectory(samples)
 endif()
 
diff -urN OpenCV-2.2.0-orig/samples/CMakeLists.txt OpenCV-2.2.0/samples/CMakeLists.txt
--- OpenCV-2.2.0-orig/samples/CMakeLists.txt	2010-12-05 05:35:25.000000000 +0200
+++ OpenCV-2.2.0/samples/CMakeLists.txt	2010-12-23 18:40:44.308817679 +0200
@@ -3,9 +3,14 @@
 #
 # ----------------------------------------------------------------------------
 
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES)
 add_subdirectory(c)
 add_subdirectory(cpp)
 add_subdirectory(gpu)
+endif()
+if(INSTALL_PYTHON_EXAMPLES AND BUILD_NEW_PYTHON_SUPPORT)
+add_subdirectory(python)
+endif()
 
 if(0)
 add_subdirectory(swig_python)
diff -urN OpenCV-2.2.0-orig/samples/python/CMakeLists.txt OpenCV-2.2.0/samples/python/CMakeLists.txt
--- OpenCV-2.2.0-orig/samples/python/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.2.0/samples/python/CMakeLists.txt	2010-12-23 18:41:18.875942736 +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()