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

android/android.toolchain.cmake

@@ -155,6 +155,7 @@
 #     [+] added special check for cygwin
 #     [+] filtered out hidden files (starting with .) while globbing inside NDK
 #     [+] automatically applied GLESv2 linkage fix for NDK revisions 5-6
+#     [+] added ANDROID_GET_ABI_RAWNAME to get NDK ABI names by CMake flags
 # ------------------------------------------------------------------------------
 
 # this one is important
@@ -890,6 +891,18 @@ macro( find_host_program )
  set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
 endmacro()
 
+macro( ANDROID_GET_ABI_RAWNAME TOOLCHAIN_FLAG VAR )
+ if( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI" )
+  set( ${VAR} "armeabi" )
+ elseif( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI_V7A" )
+    set( ${VAR} "armeabi-v7a" )
+ elseif( "${TOOLCHAIN_FLAG}" STREQUAL "X86" )
+    set( ${VAR} "x86" )
+ else()
+    set( ${VAR} "unknown" )
+ endif()
+endmacro()
+
 set( ANDROID_SET_OBSOLETE_VARIABLES ON CACHE BOOL "Define obsolete Andrid-specific cmake variables" )
 mark_as_advanced( ANDROID_SET_OBSOLETE_VARIABLES )
 if( ANDROID_SET_OBSOLETE_VARIABLES )

apps/CMakeLists.txt

+add_subdirectory(haartraining)
+add_subdirectory(traincascade)

modules/haartraining/CMakeLists.txt → apps/haartraining/CMakeLists.txt

-if(IOS)
-    return()
+if(IOS OR ANDROID)
+  return()
+endif()
+
+SET(OPENCV_HAARTRAINING_DEPS opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_video opencv_features2d opencv_flann opencv_legacy)
+ocv_check_dependencies(${OPENCV_HAARTRAINING_DEPS})
+
+if(NOT OCV_DEPENDENCIES_FOUND)
+  return()
 endif()
 
 project(haartraining)
 
-include_directories(
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${OpenCV_SOURCE_DIR}/modules/core/include"
-    "${OpenCV_SOURCE_DIR}/modules/imgproc/include"
-    "${OpenCV_SOURCE_DIR}/modules/objdetect/include"
-    "${OpenCV_SOURCE_DIR}/modules/ml/include"
-    "${OpenCV_SOURCE_DIR}/modules/highgui/include"
-    "${OpenCV_SOURCE_DIR}/modules/video/include"
-    "${OpenCV_SOURCE_DIR}/modules/features2d/include"
-    "${OpenCV_SOURCE_DIR}/modules/flann/include"
-    "${OpenCV_SOURCE_DIR}/modules/calib3d/include"
-    "${OpenCV_SOURCE_DIR}/modules/legacy/include"
-    )
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv")
+ocv_include_modules(${OPENCV_HAARTRAINING_DEPS})
 
 if(WIN32)
-    link_directories(${OpenCV_SOURCE_DIR}/lib ${OpenCV_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR})
+  link_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
-set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine)
-
-link_libraries(${haartraining_libs})
+link_libraries(${OPENCV_HAARTRAINING_DEPS} opencv_haartraining_engine)
 
 # -----------------------------------------------------------
 #  Library
 # -----------------------------------------------------------
 set(cvhaartraining_lib_src
-    _cvcommon.h
-    cvclassifier.h
-    _cvhaartraining.h
-    cvhaartraining.h
-    cvboost.cpp
-    cvcommon.cpp
-    cvhaarclassifier.cpp
-    cvhaartraining.cpp
-    cvsamples.cpp
-    )
+  _cvcommon.h
+  cvclassifier.h
+  _cvhaartraining.h
+  cvhaartraining.h
+  cvboost.cpp
+  cvcommon.cpp
+  cvhaarclassifier.cpp
+  cvhaartraining.cpp
+  cvsamples.cpp
+  )
 
 add_library(opencv_haartraining_engine STATIC ${cvhaartraining_lib_src})
 set_target_properties(opencv_haartraining_engine PROPERTIES
-    DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-    ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-    INSTALL_NAME_DIR lib
-    )
+                      DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+                      ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+                      RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+                      INSTALL_NAME_DIR lib
+                     )
 
-if(NOT ANDROID)
 # -----------------------------------------------------------
 #  haartraining
 # -----------------------------------------------------------
 
 add_executable(opencv_haartraining cvhaartraining.h haartraining.cpp)
-add_dependencies(opencv_haartraining ${haartraining_libs})
 set_target_properties(opencv_haartraining PROPERTIES
                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
                       OUTPUT_NAME "opencv_haartraining")
@@ -65,7 +57,6 @@ set_target_properties(opencv_haartraining PROPERTIES
 # -----------------------------------------------------------
 
 add_executable(opencv_createsamples cvhaartraining.h createsamples.cpp)
-add_dependencies(opencv_createsamples ${haartraining_libs})
 set_target_properties(opencv_createsamples PROPERTIES
                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
                       OUTPUT_NAME "opencv_createsamples")
@@ -74,7 +65,6 @@ set_target_properties(opencv_createsamples PROPERTIES
 #  performance
 # -----------------------------------------------------------
 add_executable(opencv_performance performance.cpp)
-add_dependencies(opencv_performance ${haartraining_libs})
 set_target_properties(opencv_performance PROPERTIES
                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
                       OUTPUT_NAME "opencv_performance")
@@ -87,12 +77,10 @@ install(TARGETS opencv_haartraining RUNTIME DESTINATION bin COMPONENT main)
 install(TARGETS opencv_createsamples RUNTIME DESTINATION bin COMPONENT main)
 install(TARGETS opencv_performance RUNTIME DESTINATION bin COMPONENT main)
 
-
 if(ENABLE_SOLUTION_FOLDERS)
-	set_target_properties(opencv_performance PROPERTIES FOLDER "applications")
-	set_target_properties(opencv_createsamples PROPERTIES FOLDER "applications")
-	set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications")
-	set_target_properties(opencv_haartraining_engine PROPERTIES FOLDER "applications")
-endif()	
-
+  set_target_properties(opencv_performance PROPERTIES FOLDER "applications")
+  set_target_properties(opencv_createsamples PROPERTIES FOLDER "applications")
+  set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications")
+  set_target_properties(opencv_haartraining_engine PROPERTIES FOLDER "applications")
 endif()
+

modules/traincascade/CMakeLists.txt → apps/traincascade/CMakeLists.txt

-if(IOS)
-    return()
+if(IOS OR ANDROID)
+  return()
+endif()
+
+SET(OPENCV_TRAINCASCADE_DEPS opencv_core opencv_ml opencv_imgproc opencv_objdetect opencv_highgui opencv_calib3d opencv_video opencv_features2d opencv_flann opencv_legacy)
+ocv_check_dependencies(${OPENCV_TRAINCASCADE_DEPS})
+
+if(NOT OCV_DEPENDENCIES_FOUND)
+  return()
 endif()
 
 project(traincascade)
 
-include_directories(
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${OpenCV_SOURCE_DIR}/modules/core/include"
-    "${OpenCV_SOURCE_DIR}/modules/imgproc/include"
-    "${OpenCV_SOURCE_DIR}/modules/objdetect/include"
-    "${OpenCV_SOURCE_DIR}/modules/ml/include"
-    "${OpenCV_SOURCE_DIR}/modules/highgui/include"
-    "${OpenCV_SOURCE_DIR}/modules/video/include"
-    "${OpenCV_SOURCE_DIR}/modules/features2d/include"
-    "${OpenCV_SOURCE_DIR}/modules/flann/include"
-    "${OpenCV_SOURCE_DIR}/modules/calib3d/include"
-    "${OpenCV_SOURCE_DIR}/modules/legacy/include"
-    )
-
-set(traincascade_libs opencv_core opencv_ml opencv_imgproc
-    opencv_objdetect opencv_highgui opencv_haartraining_engine)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv")
+ocv_include_modules(${OPENCV_TRAINCASCADE_DEPS})
 
 set(traincascade_files traincascade.cpp
-    cascadeclassifier.cpp cascadeclassifier.h
-    boost.cpp boost.h features.cpp traincascade_features.h
-    haarfeatures.cpp haarfeatures.h
-    lbpfeatures.cpp lbpfeatures.h
-	HOGfeatures.cpp HOGfeatures.h
-    imagestorage.cpp imagestorage.h)
+  cascadeclassifier.cpp cascadeclassifier.h
+  boost.cpp boost.h features.cpp traincascade_features.h
+  haarfeatures.cpp haarfeatures.h
+  lbpfeatures.cpp lbpfeatures.h
+  HOGfeatures.cpp HOGfeatures.h
+  imagestorage.cpp imagestorage.h)
 
 set(the_target opencv_traincascade)    
 add_executable(${the_target} ${traincascade_files})
+target_link_libraries(${the_target} ${OPENCV_TRAINCASCADE_DEPS} opencv_haartraining_engine)
 
-add_dependencies(${the_target} ${traincascade_libs})
 set_target_properties(${the_target} PROPERTIES
                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
                       ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
@@ -41,11 +34,8 @@ set_target_properties(${the_target} PROPERTIES
                       OUTPUT_NAME "opencv_traincascade")
 					  
 if(ENABLE_SOLUTION_FOLDERS)
-	set_target_properties(${the_target} PROPERTIES FOLDER "applications")
+  set_target_properties(${the_target} PROPERTIES FOLDER "applications")
 endif()	
 
-target_link_libraries(${the_target} ${traincascade_libs})
+install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
 
-if(NOT ANDROID)
-    install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
-endif()