File opencv-2.1-samples.patch of Package opencv

Overview Repositories Revisions Requests Users Attributes Meta

File opencv-2.1-samples.patch of Package opencv (Revision b3dd768a9226543f005a86a3d869a316)

Currently displaying revision b3dd768a9226543f005a86a3d869a316 , Show latest

diff -urN OpenCV-2.1.0-orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
--- OpenCV-2.1.0-orig/CMakeLists.txt	2010-04-06 04:24:37.000000000 +0300
+++ OpenCV-2.1.0/CMakeLists.txt	2010-04-13 17:17:47.000000000 +0300
@@ -1067,7 +1067,7 @@
 add_subdirectory(doc)
 add_subdirectory(data)
 
-if(BUILD_EXAMPLES OR INSTALL_PYTHON_EXAMPLES OR INSTALL_OCTAVE_EXAMPLES)
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR INSTALL_PYTHON_EXAMPLES OR INSTALL_OCTAVE_EXAMPLES)
     add_subdirectory(samples)
 endif()
 
diff -urN OpenCV-2.1.0-orig/samples/CMakeLists.txt OpenCV-2.1.0/samples/CMakeLists.txt
--- OpenCV-2.1.0-orig/samples/CMakeLists.txt	2010-04-06 04:24:42.000000000 +0300
+++ OpenCV-2.1.0/samples/CMakeLists.txt	2010-04-13 17:17:46.000000000 +0300
@@ -3,6 +3,15 @@
 #
 # ----------------------------------------------------------------------------
 
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES)
 add_subdirectory(c)
+endif()
+if(INSTALL_PYTHON_EXAMPLES AND BUILD_NEW_PYTHON_SUPPORT)
+add_subdirectory(python)
+endif()
+if(INSTALL_PYTHON_EXAMPLES AND BUILD_SWIG_PYTHON_SUPPORT)
 add_subdirectory(swig_python)
+endif()
+if(INSTALL_OCTAVE_EXAMPLES)
 add_subdirectory(octave)
+endif()
diff -urN OpenCV-2.1.0-orig/samples/python/CMakeLists.txt OpenCV-2.1.0/samples/python/CMakeLists.txt
--- OpenCV-2.1.0-orig/samples/python/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.1.0/samples/python/CMakeLists.txt	2010-04-13 17:18:08.000000000 +0300
@@ -0,0 +1,13 @@
+# -------------------------------------------------------------------------
+#  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.1.0-orig/samples/swig_python/CMakeLists.txt OpenCV-2.1.0/samples/swig_python/CMakeLists.txt
--- OpenCV-2.1.0-orig/samples/swig_python/CMakeLists.txt	2010-04-06 04:24:42.000000000 +0300
+++ OpenCV-2.1.0/samples/swig_python/CMakeLists.txt	2010-04-13 17:17:44.000000000 +0300
@@ -5,7 +5,7 @@
 file(GLOB PYTHON_SAMPLES *.py)
 if(NOT WIN32)
 install(FILES ${PYTHON_SAMPLES}
-        DESTINATION share/opencv/samples/python
+        DESTINATION share/opencv/samples/swig_python
         PERMISSIONS OWNER_READ OWNER_EXECUTE
                     GROUP_READ GROUP_EXECUTE
                     WORLD_READ WORLD_EXECUTE)

Places

File opencv-2.1-samples.patch of Package opencv (Revision b3dd768a9226543f005a86a3d869a316)

Places