Global CMake reorganization:

[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules

samples/CMakeLists.txt

@@ -5,16 +5,8 @@
 
 add_subdirectory(c)
 add_subdirectory(cpp)
+add_subdirectory(gpu)
 
-if(NOT ANDROID)
-    add_subdirectory(gpu)
-endif()
-
-if(BUILD_ANDROID_EXAMPLES)
-   add_subdirectory(android)
-endif()
-
-if(0)
-add_subdirectory(swig_python)
-add_subdirectory(octave)
+if(ANDROID AND BUILD_ANDROID_EXAMPLES)
+  add_subdirectory(android)
 endif()

samples/android/CMakeLists.txt

@@ -2,46 +2,33 @@
 #  CMake file for Android samples. See root CMakeLists.txt
 #
 # ----------------------------------------------------------------------------
+SET(OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS opencv_contrib opencv_legacy opencv_objdetect opencv_calib3d opencv_features2d opencv_video opencv_highgui opencv_ml opencv_imgproc opencv_flann opencv_core)
 
-if (BUILD_ANDROID_EXAMPLES)
-    project(android_samples)
+ocv_check_dependencies(${OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS} opencv_java)
 
-    include_directories(
-        "${CMAKE_SOURCE_DIR}/modules/core/include"
-        "${CMAKE_SOURCE_DIR}/modules/flann/include"
-        "${CMAKE_SOURCE_DIR}/modules/imgproc/include"
-        "${CMAKE_SOURCE_DIR}/modules/video/include"
-        "${CMAKE_SOURCE_DIR}/modules/highgui/include"
-        "${CMAKE_SOURCE_DIR}/modules/ml/include"
-        "${CMAKE_SOURCE_DIR}/modules/calib3d/include"
-        "${CMAKE_SOURCE_DIR}/modules/features2d/include"
-        "${CMAKE_SOURCE_DIR}/modules/objdetect/include"
-        "${CMAKE_SOURCE_DIR}/modules/legacy/include"
-        "${CMAKE_SOURCE_DIR}/modules/contrib/include"
-    )
+if(BUILD_ANDROID_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
+  project(android_samples)
 
-    SET (sample_dependencies opencv_contrib opencv_legacy opencv_objdetect opencv_calib3d opencv_features2d opencv_video opencv_highgui opencv_ml opencv_imgproc opencv_flann opencv_core)
-    if(NOT BUILD_SHARED_LIBS)
-        LIST(APPEND sample_dependencies opencv_androidcamera)
-    endif()
+  foreach(m ${OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS})
+    string(REPLACE "opencv_" "" m "${m}")
+    include_directories("${OpenCV_SOURCE_DIR}/modules/${m}/include")
+  endforeach()
 
-    file(GLOB android_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
-    list(REMOVE_ITEM android_samples hello-android)
-    list(SORT android_samples)
+  file(GLOB android_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
+  list(REMOVE_ITEM android_samples hello-android)
+  list(SORT android_samples)
     
-    foreach(sample ${android_samples})
-        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${sample}/AndroidManifest.xml")
-            add_android_project("${sample}" "${CMAKE_CURRENT_SOURCE_DIR}/${sample}" INSTALL)
-        endif()
-    endforeach()
-
-    #hello-android sample
-    ADD_EXECUTABLE(hello-android hello-android/main.cpp)
-    ADD_DEPENDENCIES(hello-android ${sample_dependencies})
-    TARGET_LINK_LIBRARIES(hello-android ${OPENCV_LINKER_LIBS} ${sample_dependencies})
-    set_target_properties(hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
-    if(INSTALL_ANDROID_EXAMPLES)
-        install(TARGETS hello-android DESTINATION bin COMPONENT main)
+  foreach(sample ${android_samples})
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${sample}/AndroidManifest.xml")
+      add_android_project("${sample}" "${CMAKE_CURRENT_SOURCE_DIR}/${sample}" INSTALL)
     endif()
+  endforeach()
 
+  #hello-android sample
+  ADD_EXECUTABLE(hello-android hello-android/main.cpp)
+  TARGET_LINK_LIBRARIES(hello-android ${OPENCV_LINKER_LIBS} ${OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS})
+  set_target_properties(hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
+  if(INSTALL_ANDROID_EXAMPLES)
+    install(TARGETS hello-android DESTINATION bin COMPONENT main)
+  endif()
 endif()

samples/c/CMakeLists.txt

@@ -3,67 +3,57 @@
 #
 # ----------------------------------------------------------------------------
 
-if (BUILD_EXAMPLES)
-    project(c_samples)
+SET(OPENCV_C_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
+                                   opencv_features2d opencv_calib3d opencv_legacy opencv_contrib)
 
-    if(CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+ocv_check_dependencies(${OPENCV_C_SAMPLES_REQUIRED_DEPS})
+
+if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
+  project(c_samples)
+
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+  endif()
+    
+  ocv_include_modules(${OPENCV_C_SAMPLES_REQUIRED_DEPS})
+
+  # ---------------------------------------------
+  #      Define executable targets
+  # ---------------------------------------------
+  MACRO(OPENCV_DEFINE_C_EXAMPLE name srcs)
+    set(the_target "example_${name}")
+    add_executable(${the_target} ${srcs})
+    target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_C_SAMPLES_REQUIRED_DEPS})
+
+    set_target_properties(${the_target} PROPERTIES
+      OUTPUT_NAME "${name}"
+      PROJECT_LABEL "(EXAMPLE) ${name}")
+
+    if(ENABLE_SOLUTION_FOLDERS)
+      set_target_properties(${the_target} PROPERTIES FOLDER "samples//c")
     endif()
-    
-	include_directories(
-		"${CMAKE_SOURCE_DIR}/modules/core/include"
-		"${CMAKE_SOURCE_DIR}/modules/flann/include"
-		"${CMAKE_SOURCE_DIR}/modules/imgproc/include"
-		"${CMAKE_SOURCE_DIR}/modules/video/include"
-		"${CMAKE_SOURCE_DIR}/modules/highgui/include"
-		"${CMAKE_SOURCE_DIR}/modules/ml/include"
-		"${CMAKE_SOURCE_DIR}/modules/calib3d/include"
-		"${CMAKE_SOURCE_DIR}/modules/features2d/include"
-		"${CMAKE_SOURCE_DIR}/modules/objdetect/include"
-		"${CMAKE_SOURCE_DIR}/modules/legacy/include"
-		"${CMAKE_SOURCE_DIR}/modules/contrib/include"
-	)
 
-    # ---------------------------------------------
-    #      Define executable targets
-    # ---------------------------------------------
-    MACRO(MY_DEFINE_EXAMPLE name srcs)
-        set(the_target "example_${name}")
-    	add_executable(${the_target} ${srcs})
-		set_target_properties(${the_target} PROPERTIES
-		    OUTPUT_NAME "${name}"
-		    PROJECT_LABEL "(EXAMPLE) ${name}")
-    	add_dependencies(${the_target} opencv_core opencv_flann opencv_imgproc opencv_highgui
-    	    opencv_ml opencv_video opencv_objdetect opencv_features2d
-    	    opencv_calib3d opencv_legacy opencv_contrib)
-    	target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core
-    	    opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
-    	    opencv_features2d opencv_calib3d opencv_legacy opencv_contrib)
-			
-		if(ENABLE_SOLUTION_FOLDERS)
-			set_target_properties(${the_target} PROPERTIES FOLDER "samples//c")
-		endif()
-        if(WIN32)
-	    if (MSVC AND NOT BUILD_SHARED_LIBS)
-	        set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
-	    endif()
-            install(TARGETS ${the_target}
-                RUNTIME DESTINATION "samples/c" COMPONENT main)
-        endif()
-    ENDMACRO(MY_DEFINE_EXAMPLE)
+    if(WIN32)
+      if(MSVC AND NOT BUILD_SHARED_LIBS)
+        set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
+      endif()
+      install(TARGETS ${the_target}
+              RUNTIME DESTINATION "samples/c" COMPONENT main)
+    endif()
+  ENDMACRO()
     
-    file(GLOB cpp_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.c)
+  file(GLOB cpp_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.c)
     
-    foreach(sample_filename ${cpp_samples})
-        get_filename_component(sample ${sample_filename} NAME_WE)
-        MY_DEFINE_EXAMPLE(${sample}  ${sample_filename})
-    endforeach()
-endif(BUILD_EXAMPLES)
+  foreach(sample_filename ${cpp_samples})
+    get_filename_component(sample ${sample_filename} NAME_WE)
+    OPENCV_DEFINE_C_EXAMPLE(${sample}  ${sample_filename})
+  endforeach()
+endif()
 
 if (INSTALL_C_EXAMPLES AND NOT WIN32)
-    file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
-    install(FILES ${C_SAMPLES}
-            DESTINATION share/opencv/samples/c
-            PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+  file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+  install(FILES ${C_SAMPLES}
+          DESTINATION share/opencv/samples/c
+          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 endif ()
 

samples/cpp/CMakeLists.txt

@@ -3,77 +3,67 @@
 #
 # ----------------------------------------------------------------------------
 
-if (BUILD_EXAMPLES)
-    project(cpp_samples)
+SET(OPENCV_CPP_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
+                                     opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_stitching)
 
-    include_directories(
-        "${CMAKE_SOURCE_DIR}/modules/core/include"
-        "${CMAKE_SOURCE_DIR}/modules/flann/include"
-        "${CMAKE_SOURCE_DIR}/modules/imgproc/include"
-        "${CMAKE_SOURCE_DIR}/modules/video/include"
-        "${CMAKE_SOURCE_DIR}/modules/highgui/include"
-        "${CMAKE_SOURCE_DIR}/modules/ml/include"
-        "${CMAKE_SOURCE_DIR}/modules/calib3d/include"
-        "${CMAKE_SOURCE_DIR}/modules/features2d/include"
-        "${CMAKE_SOURCE_DIR}/modules/objdetect/include"
-        "${CMAKE_SOURCE_DIR}/modules/legacy/include"
-        "${CMAKE_SOURCE_DIR}/modules/contrib/include"
-        "${CMAKE_SOURCE_DIR}/modules/stitching/include"
-    )
-    if (NOT ANDROID)
-       include_directories("${CMAKE_SOURCE_DIR}/modules/gpu/include")
-    endif()
+ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
 
-    if(CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
-    endif()
+
+if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
+  project(cpp_samples)
+
+  include_directories("${OpenCV_SOURCE_DIR}/include")#for opencv.hpp
+  ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
+
+  if (HAVE_opencv_gpu)
+    include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
+  endif()
+
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+  endif()
     
-    # ---------------------------------------------
-    #      Define executable targets
-    # ---------------------------------------------
-    MACRO(MY_DEFINE_EXAMPLE name srcs)
-        set(the_target "example_${name}")
-        add_executable(${the_target} ${srcs})
-        set_target_properties(${the_target} PROPERTIES
-            OUTPUT_NAME "${name}"
-            PROJECT_LABEL "(EXAMPLE) ${name}")
-        add_dependencies(${the_target} opencv_core opencv_flann opencv_imgproc opencv_highgui
-            opencv_ml opencv_video opencv_objdetect opencv_features2d
-            opencv_calib3d opencv_legacy opencv_contrib opencv_stitching)
-        target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core
-            opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
-            opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_stitching)
+  # ---------------------------------------------
+  #      Define executable targets
+  # ---------------------------------------------
+  MACRO(OPENCV_DEFINE_CPP_EXAMPLE name srcs)
+    set(the_target "example_${name}")
+    add_executable(${the_target} ${srcs})
+    target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
 
-       if (NOT ANDROID)
-            target_link_libraries(${the_target} opencv_gpu)
-            add_dependencies(${the_target} opencv_gpu)
-       endif()
+    if (HAVE_opencv_gpu)
+      target_link_libraries(${the_target} opencv_gpu)
+    endif()
+
+    set_target_properties(${the_target} PROPERTIES
+      OUTPUT_NAME "${name}"
+      PROJECT_LABEL "(EXAMPLE) ${name}")
             
-        if(ENABLE_SOLUTION_FOLDERS)
-            set_target_properties(${the_target} PROPERTIES FOLDER "samples//cpp")
-        endif()
+    if(ENABLE_SOLUTION_FOLDERS)
+      set_target_properties(${the_target} PROPERTIES FOLDER "samples//cpp")
+    endif()
 
-        if(WIN32)
-        if (MSVC AND NOT BUILD_SHARED_LIBS)
-            set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
-        endif()
-            install(TARGETS ${the_target}
-                RUNTIME DESTINATION "samples/cpp" COMPONENT main)
-        endif()
-    ENDMACRO(MY_DEFINE_EXAMPLE)
+    if(WIN32)
+      if (MSVC AND NOT BUILD_SHARED_LIBS)
+        set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
+      endif()
+      install(TARGETS ${the_target}
+              RUNTIME DESTINATION "samples/cpp" COMPONENT main)
+    endif()
+  ENDMACRO()
     
-    file(GLOB cpp_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+  file(GLOB cpp_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
     
-    foreach(sample_filename ${cpp_samples})
-        get_filename_component(sample ${sample_filename} NAME_WE)
-        MY_DEFINE_EXAMPLE(${sample}  ${sample_filename})
-    endforeach()
-endif(BUILD_EXAMPLES)
+  foreach(sample_filename ${cpp_samples})
+    get_filename_component(sample ${sample_filename} NAME_WE)
+    OPENCV_DEFINE_CPP_EXAMPLE(${sample}  ${sample_filename})
+  endforeach()
+endif()
 
 if (INSTALL_C_EXAMPLES AND NOT WIN32)
-    file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
-    install(FILES ${C_SAMPLES}
-            DESTINATION share/opencv/samples/cpp
-            PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-endif ()
+  file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+  install(FILES ${C_SAMPLES}
+          DESTINATION share/opencv/samples/cpp
+          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+endif()
 

samples/cpp/hybridtrackingsample.cpp

@@ -11,14 +11,15 @@
  *
  */
 
-#include <cv.h>
-#include <ml.h>
-#include <cvaux.h>
-#include <highgui.h>
+//#include <cv.h>
+//#include <ml.h>
+//#include <cvaux.h>
+//#include <highgui.h>
 #include <stdio.h>
 #include <time.h>
 #include <iostream>
 
+#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/contrib/hybridtracker.hpp"
 
 using namespace cv;

samples/cpp/image.cpp

@@ -1,8 +1,7 @@
-#include "cv.h" // include standard OpenCV headers, same as before
-#include "highgui.h"
-#include "ml.h"
 #include <stdio.h>
 #include <iostream>
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/flann/miniflann.hpp"
 
 using namespace cv; // all the new API is put into "cv" namespace. Export its content

samples/cpp/stitching_detailed.cpp

@@ -43,6 +43,7 @@
 
 #include <fstream>
 #include <string>
+#include "opencv2/opencv_modules.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/stitching/detail/autocalib.hpp"
 #include "opencv2/stitching/detail/blenders.hpp"
@@ -346,7 +347,7 @@ int main(int argc, char* argv[])
     Ptr<FeaturesFinder> finder;
     if (features == "surf")
     {
-#ifndef ANDROID
+#ifdef HAVE_OPENCV_GPU
         if (try_gpu && gpu::getCudaEnabledDeviceCount() > 0)
             finder = new SurfFeaturesFinderGpu();
         else
@@ -530,7 +531,7 @@ int main(int argc, char* argv[])
     // Warp images and their masks
 
     Ptr<WarperCreator> warper_creator;
-#ifndef ANDROID
+#ifdef HAVE_OPENCV_GPU
     if (try_gpu && gpu::getCudaEnabledDeviceCount() > 0)
     {
         if (warp_type == "plane") warper_creator = new cv::PlaneWarperGpu();
@@ -582,7 +583,7 @@ int main(int argc, char* argv[])
         seam_finder = new detail::VoronoiSeamFinder();
     else if (seam_find_type == "gc_color")
     {
-#ifndef ANDROID
+#ifdef HAVE_OPENCV_GPU
         if (try_gpu && gpu::getCudaEnabledDeviceCount() > 0)
             seam_finder = new detail::GraphCutSeamFinderGpu(GraphCutSeamFinderBase::COST_COLOR);
         else
@@ -591,7 +592,7 @@ int main(int argc, char* argv[])
     }
     else if (seam_find_type == "gc_colorgrad")
     {
-#ifndef ANDROID
+#ifdef HAVE_OPENCV_GPU
         if (try_gpu && gpu::getCudaEnabledDeviceCount() > 0)
             seam_finder = new detail::GraphCutSeamFinderGpu(GraphCutSeamFinderBase::COST_COLOR_GRAD);
         else

samples/gpu/CMakeLists.txt

@@ -1,77 +1,69 @@
-if (BUILD_EXAMPLES)
-    set(project "gpu")
-    string(TOUPPER "${project}" project_upper)
-    
-    project("${project}_samples")
+SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_highgui
+                                     opencv_ml opencv_video opencv_objdetect opencv_features2d
+                                     opencv_calib3d opencv_legacy opencv_contrib opencv_gpu)
 
-    include_directories(
-        "${CMAKE_SOURCE_DIR}/modules/core/include"
-        "${CMAKE_SOURCE_DIR}/modules/flann/include"
-        "${CMAKE_SOURCE_DIR}/modules/imgproc/include"
-        "${CMAKE_SOURCE_DIR}/modules/video/include"
-        "${CMAKE_SOURCE_DIR}/modules/highgui/include"
-        "${CMAKE_SOURCE_DIR}/modules/ml/include"
-        "${CMAKE_SOURCE_DIR}/modules/calib3d/include"
-        "${CMAKE_SOURCE_DIR}/modules/features2d/include"
-        "${CMAKE_SOURCE_DIR}/modules/objdetect/include"
-        "${CMAKE_SOURCE_DIR}/modules/legacy/include"
-        "${CMAKE_SOURCE_DIR}/modules/contrib/include"
-        "${CMAKE_SOURCE_DIR}/modules/gpu/include"
-        "${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia"
-        "${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/core"
+ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
+
+if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
+  set(project "gpu")
+  string(TOUPPER "${project}" project_upper)
+    
+  project("${project}_samples")
+
+  ocv_include_modules(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
+  include_directories(
+    "${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia"
+    "${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia/core"
     )
 
-    if(HAVE_CUDA)
-        include_directories(${CUDA_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/core)
+  if(HAVE_CUDA)
+    include_directories(${CUDA_INCLUDE_DIRS} ${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia ${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia/core)
+  endif()
+
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+  endif()
+
+  # ---------------------------------------------
+  #      Define executable targets
+  # ---------------------------------------------
+  MACRO(OPENCV_DEFINE_GPU_EXAMPLE name srcs)
+    set(the_target "example_${project}_${name}")
+    add_executable(${the_target} ${srcs})
+
+    target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
+
+    set_target_properties(${the_target} PROPERTIES
+      OUTPUT_NAME "${name}_${project}"                                       
+      PROJECT_LABEL "(EXAMPLE_${project_upper}) ${name}")
+        
+    if(ENABLE_SOLUTION_FOLDERS)
+      set_target_properties(${the_target} PROPERTIES FOLDER "samples//${project}")
     endif()
 
-    if(CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+    if(WIN32)
+      if(MSVC AND NOT BUILD_SHARED_LIBS)
+        set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
+      endif()
+      install(TARGETS ${the_target} RUNTIME DESTINATION "samples/${project}" COMPONENT main)
     endif()
+  ENDMACRO()
 
-    # ---------------------------------------------
-    #      Define executable targets
-    # ---------------------------------------------
-    MACRO(MY_DEFINE_EXAMPLE name srcs)
-        set(the_target "example_${project}_${name}")
-        add_executable(${the_target} ${srcs})
-        set_target_properties(${the_target} PROPERTIES
-                OUTPUT_NAME "${name}_${project}"                                       
-                PROJECT_LABEL "(EXAMPLE_${project_upper}) ${name}")
-        add_dependencies(${the_target} opencv_core opencv_flann opencv_imgproc opencv_highgui
-            opencv_ml opencv_video opencv_objdetect opencv_features2d
-            opencv_calib3d opencv_legacy opencv_contrib opencv_gpu)
-        target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core
-            opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
-            opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_gpu)
+  file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
 
-        if(ENABLE_SOLUTION_FOLDERS)
-            set_target_properties(${the_target} PROPERTIES FOLDER "samples//${project}")
-        endif()
+  foreach(sample_filename ${all_samples})
+    get_filename_component(sample ${sample_filename} NAME_WE)
+    file(GLOB sample_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${sample}.*)
+    OPENCV_DEFINE_GPU_EXAMPLE(${sample} ${sample_srcs})
+  endforeach()
 
-        if(WIN32)
-            if (MSVC AND NOT BUILD_SHARED_LIBS)
-                set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
-            endif()
-            install(TARGETS ${the_target} RUNTIME DESTINATION "samples/${project}" COMPONENT main)
-        endif()
-    ENDMACRO(MY_DEFINE_EXAMPLE)
-
-    file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
-
-    foreach(sample_filename ${all_samples})
-        get_filename_component(sample ${sample_filename} NAME_WE)
-        file(GLOB sample_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${sample}.*)
-        MY_DEFINE_EXAMPLE(${sample} ${sample_srcs})
-    endforeach()
-
-    include("performance/CMakeLists.txt")
-endif(BUILD_EXAMPLES)
+  include("performance/CMakeLists.txt")
+endif()
 
 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}
-            PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-endif ()
+  file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+  install(FILES ${install_list}
+          DESTINATION share/opencv/samples/${project}
+          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+endif()
 

samples/gpu/cascadeclassifier_nvidia_api.cpp

@@ -6,7 +6,6 @@
 #include <iostream>
 #include <iomanip>
 #include <cstdio>
-#include "opencv2/opencv.hpp"
 #include "opencv2/gpu/gpu.hpp"
 
 #ifdef HAVE_CUDA
@@ -228,6 +227,7 @@ int main(int argc, const char** argv)
     NCVVectorAlloc<HaarClassifierNode128> h_haarNodes(cpuCascadeAllocator, haarNumNodes);
     ncvAssertPrintReturn(h_haarNodes.isMemAllocated(), "Error in cascade CPU allocator", -1);
     NCVVectorAlloc<HaarFeature64> h_haarFeatures(cpuCascadeAllocator, haarNumFeatures);
+
     ncvAssertPrintReturn(h_haarFeatures.isMemAllocated(), "Error in cascade CPU allocator", -1);
 
     HaarClassifierCascadeDescriptor haar;

samples/gpu/opticalflow_nvidia_api.cpp

@@ -11,7 +11,6 @@
 #include "cvconfig.h"
 #include <iostream>
 #include <iomanip>
-#include "opencv2/opencv.hpp"
 #include "opencv2/gpu/gpu.hpp"
 
 #ifdef HAVE_CUDA

samples/gpu/performance/CMakeLists.txt

@@ -4,30 +4,23 @@ file(GLOB sources "performance/*.cpp")
 file(GLOB headers "performance/*.h")
 
 add_executable(${the_target} ${sources} ${headers})
+target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
 
 set_target_properties(${the_target} PROPERTIES
     OUTPUT_NAME "performance_gpu"
     PROJECT_LABEL "(EXAMPLE_GPU) performance")
     
-add_dependencies(${the_target} opencv_core opencv_flann opencv_imgproc opencv_highgui
-    opencv_ml opencv_video opencv_objdetect opencv_features2d
-    opencv_calib3d opencv_legacy opencv_contrib opencv_gpu)
-    
-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core
-    opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
-    opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_gpu)
-	
 if(ENABLE_SOLUTION_FOLDERS)
-	set_target_properties(${the_target} PROPERTIES FOLDER "samples//gpu")
+  set_target_properties(${the_target} PROPERTIES FOLDER "samples//gpu")
 endif()	
 
 if(WIN32)
-    install(TARGETS ${the_target} RUNTIME DESTINATION "samples/gpu" COMPONENT main)
+  install(TARGETS ${the_target} RUNTIME DESTINATION "samples/gpu" COMPONENT main)
 endif()
 
 if(NOT WIN32)
-    file(GLOB GPU_FILES performance/*.cpp performance/*.h)
-    install(FILES ${GPU_FILES}
-            DESTINATION share/opencv/samples/gpu/performance
-            PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-endif()
+  file(GLOB GPU_FILES performance/*.cpp performance/*.h)
+  install(FILES ${GPU_FILES}
+          DESTINATION share/opencv/samples/gpu/performance
+          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+endif()