2012-07-22 15:17:05 +02:00
|
|
|
diff -urN OpenCV-2.4.2-orig/CMakeLists.txt OpenCV-2.4.2/CMakeLists.txt
|
|
|
|
|
--- OpenCV-2.4.2-orig/CMakeLists.txt 2012-06-29 01:56:14.000000000 +0300
|
|
|
|
|
+++ OpenCV-2.4.2/CMakeLists.txt 2012-07-05 11:43:12.211958988 +0300
|
|
|
|
|
@@ -423,7 +423,7 @@
|
2012-05-16 21:08:46 +02:00
|
|
|
add_subdirectory(apps)
|
2011-08-24 14:04:40 +02:00
|
|
|
|
2012-05-16 21:08:46 +02:00
|
|
|
# examples
|
2011-08-24 14:04:40 +02:00
|
|
|
-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)
|
2012-05-16 21:08:46 +02:00
|
|
|
add_subdirectory(samples)
|
2011-08-24 14:04:40 +02:00
|
|
|
endif()
|
|
|
|
|
|
2012-07-22 15:17:05 +02:00
|
|
|
diff -urN OpenCV-2.4.2-orig/samples/CMakeLists.txt OpenCV-2.4.2/samples/CMakeLists.txt
|
|
|
|
|
--- OpenCV-2.4.2-orig/samples/CMakeLists.txt 2012-06-29 01:55:28.000000000 +0300
|
|
|
|
|
+++ OpenCV-2.4.2/samples/CMakeLists.txt 2012-07-05 11:43:12.212959015 +0300
|
2012-05-16 21:08:46 +02:00
|
|
|
@@ -3,6 +3,7 @@
|
2011-08-24 14:04:40 +02:00
|
|
|
#
|
|
|
|
|
# ----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES)
|
|
|
|
|
add_subdirectory(c)
|
|
|
|
|
add_subdirectory(cpp)
|
2012-05-16 21:08:46 +02:00
|
|
|
add_subdirectory(gpu)
|
|
|
|
|
@@ -10,3 +11,9 @@
|
|
|
|
|
if(ANDROID AND BUILD_ANDROID_EXAMPLES)
|
|
|
|
|
add_subdirectory(android)
|
2011-08-24 14:04:40 +02:00
|
|
|
endif()
|
|
|
|
|
+endif()
|
|
|
|
|
+
|
2012-05-16 21:08:46 +02:00
|
|
|
+if(INSTALL_PYTHON_EXAMPLES)
|
2011-08-24 14:04:40 +02:00
|
|
|
+add_subdirectory(python)
|
|
|
|
|
+add_subdirectory(python2)
|
|
|
|
|
+endif()
|
2012-07-22 15:17:05 +02:00
|
|
|
diff -urN OpenCV-2.4.2-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.2/samples/gpu/CMakeLists.txt
|
|
|
|
|
--- OpenCV-2.4.2-orig/samples/gpu/CMakeLists.txt 2012-06-29 01:55:28.000000000 +0300
|
|
|
|
|
+++ OpenCV-2.4.2/samples/gpu/CMakeLists.txt 2012-07-05 11:43:12.212959015 +0300
|
2012-05-16 21:08:46 +02:00
|
|
|
@@ -64,7 +64,7 @@
|
2012-07-22 15:17:05 +02:00
|
|
|
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
2012-05-16 21:08:46 +02:00
|
|
|
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
|
|
|
|
install(FILES ${install_list}
|
2012-07-22 15:17:05 +02:00
|
|
|
- DESTINATION share/OpenCV/samples/${project}
|
|
|
|
|
+ DESTINATION share/OpenCV/samples/gpu
|
2012-05-16 21:08:46 +02:00
|
|
|
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
|
|
|
|
endif()
|
2011-08-24 14:04:40 +02:00
|
|
|
|
2012-07-22 15:17:05 +02:00
|
|
|
diff -urN OpenCV-2.4.2-orig/samples/python/CMakeLists.txt OpenCV-2.4.2/samples/python/CMakeLists.txt
|
|
|
|
|
--- OpenCV-2.4.2-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
|
|
|
|
|
+++ OpenCV-2.4.2/samples/python/CMakeLists.txt 2012-07-05 11:43:25.429310480 +0300
|
2011-08-24 14:04:40 +02:00
|
|
|
@@ -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}
|
2012-07-22 15:17:05 +02:00
|
|
|
+ DESTINATION share/OpenCV/samples/python
|
2011-08-24 14:04:40 +02:00
|
|
|
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
|
|
|
|
|
+ GROUP_READ GROUP_EXECUTE
|
|
|
|
|
+ WORLD_READ WORLD_EXECUTE)
|
|
|
|
|
+endif()
|
2012-07-22 15:17:05 +02:00
|
|
|
diff -urN OpenCV-2.4.2-orig/samples/python2/CMakeLists.txt OpenCV-2.4.2/samples/python2/CMakeLists.txt
|
|
|
|
|
--- OpenCV-2.4.2-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
|
|
|
|
|
+++ OpenCV-2.4.2/samples/python2/CMakeLists.txt 2012-07-05 11:43:39.461679267 +0300
|
2011-08-24 14:04:40 +02:00
|
|
|
@@ -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}
|
2012-07-22 15:17:05 +02:00
|
|
|
+ DESTINATION share/OpenCV/samples/python2
|
2011-08-24 14:04:40 +02:00
|
|
|
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
|
|
|
|
|
+ GROUP_READ GROUP_EXECUTE
|
|
|
|
|
+ WORLD_READ WORLD_EXECUTE)
|
|
|
|
|
+endif()
|
