Install: added prebuilt samples installation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2620bbe8083c4a78826337c0f23b758ca983abdb..d143a7aeaa5e66a2be489255586b8c13a0637e7e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -463,6 +463,7 @@ OCV_OPTION(BUILD_JAVA               "Enable Java support"
 # OpenCV installation options
 # ===================================================
 OCV_OPTION(INSTALL_CREATE_DISTRIB   "Change install rules to build the distribution package" OFF )
+OCV_OPTION(INSTALL_BIN_EXAMPLES     "Install prebuilt examples" WIN32 IF BUILD_EXAMPLES)
 OCV_OPTION(INSTALL_C_EXAMPLES       "Install C examples"        OFF )
 OCV_OPTION(INSTALL_PYTHON_EXAMPLES  "Install Python examples"   OFF )
 OCV_OPTION(INSTALL_ANDROID_EXAMPLES "Install Android examples"  OFF IF ANDROID )

diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index 634b5b264c0c7addd9298a2a1277dbf7ed58167e..10ee4060327bd0a8bb69073853a867d47e4f0055 100644 (file)
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -1337,8 +1337,8 @@ function(ocv_add_samples)
         endif()
         add_dependencies(${parent_target} ${the_target})
 
-        if(WIN32)
-          install(TARGETS ${the_target} RUNTIME DESTINATION "samples/${module_id}" COMPONENT samples)
+        if(INSTALL_BIN_EXAMPLES)
+          install(TARGETS ${the_target} RUNTIME DESTINATION "${OPENCV_SAMPLES_BIN_INSTALL_PATH}/${module_id}" COMPONENT samples)
         endif()
       endforeach()
     endif()

diff --git a/samples/samples_utils.cmake b/samples/samples_utils.cmake
index 845b4585ea10c536d3c2923714e8c0620fdf928b..9459099200dc90e57d42fd8f38e84be895508769 100644 (file)
--- a/samples/samples_utils.cmake
+++ b/samples/samples_utils.cmake
@@ -15,8 +15,12 @@ function(ocv_define_sample out_target source sub)
   if(WIN32 AND MSVC AND NOT BUILD_SHARED_LIBS)
     set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
   endif()
-  if(WIN32)
-    install(TARGETS ${the_target} RUNTIME DESTINATION "samples/${sub}" COMPONENT samples)
+  # Should be usable in stand-alone build scenario
+  if((NOT DEFINED INSTALL_BIN_EXAMPLES AND WIN32) OR INSTALL_BIN_EXAMPLES)
+    if(NOT DEFINED OPENCV_SAMPLES_BIN_INSTALL_PATH)
+      set(OPENCV_SAMPLES_BIN_INSTALL_PATH "samples")
+    endif()
+    install(TARGETS ${the_target} RUNTIME DESTINATION "${OPENCV_SAMPLES_BIN_INSTALL_PATH}/${sub}" COMPONENT samples)
   endif()
   # Add single target to build all samples in the group: 'make opencv_samples_cpp'
   set(parent_target opencv_samples_${sub})