More accurate deb package build fix for CUDA 6.5 and newer.

Deb package build fix for CUDA 6.5 and newer.
Build fixes for CUDA 6.5
2026-07-25 21:33:04 +04:00 · 2014-07-14 23:58:05 +04:00 · 2014-07-14 21:27:23 +04:00 · 2014-07-14 16:39:23 +04:00 · 2014-02-14 17:12:31 +04:00 · 2014-02-13 20:13:47 +04:00
693 changed files with 366793 additions and 373404 deletions
@@ -1,7 +1,6 @@
 *.autosave
 *.pyc
 *.user
-*~
 .*.swp
 .DS_Store
 .sw[a-z]
@@ -1,2 +0,0 @@
-[tgit]
-    icon = doc/opencv.ico
@@ -1 +0,0 @@
-ippicv
@@ -210,7 +210,7 @@
 #include <string>
 #endif 

-#if defined(__linux__) || defined(__APPLE__) || defined(__MACOSX)
+#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
 #include <alloca.h>

 #include <emmintrin.h>
@@ -14,7 +14,7 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIR})
 file(GLOB lib_srcs *.c)
 file(GLOB lib_hdrs *.h)

-if(ARM AND NEON)
+if(NEON)
  list(APPEND lib_srcs arm/filter_neon.S)
  add_definitions(-DPNG_ARM_NEON)
 endif()
@@ -54,7 +54,7 @@

 /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
   (Intel) */
-#define HOST_BIGENDIAN @WORDS_BIGENDIAN@
+#define HOST_BIGENDIAN 0

 /* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
 #define HOST_FILLORDER FILLORDER_LSB2MSB
@@ -156,7 +156,15 @@

 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
   significant byte first (like Motorola and SPARC, unlike Intel). */
-#cmakedefine WORDS_BIGENDIAN 1
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif

 /* Support Deflate compression */
 #define ZIP_SUPPORT 1
@@ -5,26 +5,21 @@ if (WIN32 AND NOT ARM)
  message(FATAL_ERROR "BUILD_TBB option supports Windows on ARM only!\nUse regular official TBB build instead of the BUILD_TBB option!")
 endif()

-set(tbb_ver "tbb43_20141204oss")
-set(tbb_url "http://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb43_20141204oss_src.tgz")
-set(tbb_md5 "e903dd92d9433701f097fa7ca29a3c1f")
-set(tbb_version_file "version_string.ver")
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702)
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
-
-# 4.1 update 4 - The first release that supports Windows RT. Hangs on some Android devices
-#set(tbb_ver "tbb41_20130613oss")
-#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130613oss_src.tgz")
-#set(tbb_md5 "108c8c1e481b0aaea61878289eb28b6a")
-#set(tbb_version_file "version_string.ver")
-#ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702)
-
-# 4.1 update 2 - works fine
-#set(tbb_ver "tbb41_20130116oss")
-#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130116oss_src.tgz")
-#set(tbb_md5 "3809790e1001a1b32d59c9fee590ee85")
-#set(tbb_version_file "version_string.ver")
-#ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
+if (WIN32 AND ARM)
+  # 4.1 update 4 - The first release that supports Windows RT. Hangs on some Android devices
+  set(tbb_ver "tbb41_20130613oss")
+  set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130613oss_src.tgz")
+  set(tbb_md5 "108c8c1e481b0aaea61878289eb28b6a")
+  set(tbb_version_file "version_string.ver")
+  ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702)
+else()
+  # 4.1 update 2 - works fine
+  set(tbb_ver "tbb41_20130116oss")
+  set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130116oss_src.tgz")
+  set(tbb_md5 "3809790e1001a1b32d59c9fee590ee85")
+  set(tbb_version_file "version_string.ver")
+  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
+endif()

 # 4.1 update 3 dev - Hangs on some Android devices
 #set(tbb_ver "tbb41_20130401oss")
@@ -118,7 +113,7 @@ if(NOT EXISTS "${tbb_tarball}")
  message(STATUS "Downloading ${tbb_ver}_src.tgz")
  file(DOWNLOAD "${tbb_url}" "${tbb_tarball}" TIMEOUT 600 STATUS __statvar)
  if(NOT __statvar EQUAL 0)
-    message(FATAL_ERROR "Failed to download TBB sources (${__statvar}): ${tbb_url}")
+    message(FATAL_ERROR "Failed to download TBB sources: ${tbb_url}")
  endif()
  getMD5("${tbb_tarball}" tbb_local_md5)
  if(NOT tbb_local_md5 STREQUAL tbb_md5)
@@ -174,7 +169,6 @@ if (WIN32)
 set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} /APPCONTAINER")
 else()
  add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0         #required
-                  -D__TBB_WEAK_SYMBOLS_PRESENT=0         #required for 4.3
                  -D__TBB_BUILD=1                        #required
                  -D__TBB_SURVIVE_THREAD_SWITCH=0        #no cilk support
                  -DTBB_USE_DEBUG=0                      #just to be sure
@@ -204,7 +198,7 @@ endif()

 set(TBB_SOURCE_FILES ${lib_srcs} ${lib_hdrs})

-if ((ARM OR AARCH64) AND NOT WIN32)
+if (ARM AND NOT WIN32)
  if (NOT ANDROID)
    set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/arm_linux_stub.cpp")
  endif()
@@ -82,7 +82,7 @@ if(UNIX)
  endif()
 endif()

-ocv_warnings_disable(CMAKE_C_FLAGS -Wshorten-64-to-32 -Wattributes -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations)
+ocv_warnings_disable(CMAKE_C_FLAGS -Wattributes -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations)

 set_target_properties(${ZLIB_LIBRARY} PROPERTIES
        OUTPUT_NAME ${ZLIB_LIBRARY}
@@ -47,19 +47,12 @@ if(POLICY CMP0022)
  cmake_policy(SET CMP0022 OLD)
 endif()

-if(POLICY CMP0026)
-  # silence cmake 3.0+ warnings about reading LOCATION attribute
-  cmake_policy(SET CMP0026 OLD)
-endif()
-
 # must go before the project command
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
 if(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8")
  set_property( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
 endif()

-enable_testing()
-
 project(OpenCV CXX C)

 if(MSVC)
@@ -135,22 +128,20 @@ OCV_OPTION(WITH_1394           "Include IEEE1394 support"                    ON
 OCV_OPTION(WITH_AVFOUNDATION   "Use AVFoundation for Video I/O"              ON   IF IOS)
 OCV_OPTION(WITH_CARBON         "Use Carbon for UI instead of Cocoa"          OFF  IF APPLE )
 OCV_OPTION(WITH_CUDA           "Include NVidia Cuda Runtime support"         ON   IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
-OCV_OPTION(WITH_VTK            "Include VTK library support (and build opencv_viz module eiher)"             OFF IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_CUFFT          "Include NVidia Cuda Fast Fourier Transform (FFT) library support"            ON  IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
 OCV_OPTION(WITH_CUBLAS         "Include NVidia Cuda Basic Linear Algebra Subprograms (BLAS) library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
 OCV_OPTION(WITH_NVCUVID        "Include NVidia Video Decoding library support"                               OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS AND NOT APPLE) )
 OCV_OPTION(WITH_EIGEN          "Include Eigen2/Eigen3 support"               ON)
 OCV_OPTION(WITH_VFW            "Include Video for Windows support"           ON   IF WIN32 )
 OCV_OPTION(WITH_FFMPEG         "Include FFMPEG support"                      ON   IF (NOT ANDROID AND NOT IOS))
-OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON   IF (UNIX AND NOT ANDROID) )
-OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)"   OFF )
+OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_GTK            "Include GTK support"                         ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_IMAGEIO        "ImageIO support for OS X"                    OFF  IF APPLE )
 OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF  IF (MSVC OR X86 OR X86_64) )
 OCV_OPTION(WITH_JASPER         "Include JPEG2K support"                      ON   IF (NOT IOS) )
 OCV_OPTION(WITH_JPEG           "Include JPEG support"                        ON)
 OCV_OPTION(WITH_OPENEXR        "Include ILM support via OpenEXR"             ON   IF (NOT IOS) )
-OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF  IF (NOT ANDROID) )
+OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF  IF (NOT ANDROID AND NOT APPLE) )
 OCV_OPTION(WITH_OPENNI         "Include OpenNI support"                      OFF  IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_PNG            "Include PNG support"                         ON)
 OCV_OPTION(WITH_PVAPI          "Include Prosilica GigE support"              ON   IF (NOT ANDROID AND NOT IOS) )
@@ -167,7 +158,7 @@ OCV_OPTION(WITH_V4L            "Include Video 4 Linux support"               ON
 OCV_OPTION(WITH_LIBV4L         "Use libv4l for Video 4 Linux support"        ON   IF (UNIX AND NOT ANDROID) )
 OCV_OPTION(WITH_DSHOW          "Build HighGUI with DirectShow support"       ON   IF (WIN32 AND NOT ARM) )
 OCV_OPTION(WITH_MSMF           "Build HighGUI with Media Foundation support" OFF  IF WIN32 )
-OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF (NOT ANDROID) )
+OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF (NOT ANDROID AND NOT APPLE) )
 OCV_OPTION(WITH_XINE           "Include Xine support (GPL)"                  OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_OPENCL         "Include OpenCL Runtime support"              ON   IF (NOT IOS) )
 OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      ON   IF (NOT ANDROID AND NOT IOS) )
@@ -214,7 +205,6 @@ OCV_OPTION(ENABLE_DYNAMIC_CUDA        "Enabled dynamic CUDA linkage"
 OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers"                                  ON   IF (NOT IOS) )
 OCV_OPTION(ENABLE_SOLUTION_FOLDERS    "Solution folder in Visual Studio or in other IDEs"        (MSVC_IDE OR CMAKE_GENERATOR MATCHES Xcode) IF (CMAKE_VERSION VERSION_GREATER "2.8.0") )
 OCV_OPTION(ENABLE_PROFILING           "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF  IF CMAKE_COMPILER_IS_GNUCXX )
-OCV_OPTION(ENABLE_COVERAGE            "Enable coverage collection with  GCov"                    OFF  IF CMAKE_COMPILER_IS_GNUCXX )
 OCV_OPTION(ENABLE_OMIT_FRAME_POINTER  "Enable -fomit-frame-pointer for GCC"                      ON   IF CMAKE_COMPILER_IS_GNUCXX AND NOT (APPLE AND CMAKE_COMPILER_IS_CLANGCXX) )
 OCV_OPTION(ENABLE_POWERPC             "Enable PowerPC for GCC"                                   ON   IF (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES powerpc.*) )
 OCV_OPTION(ENABLE_FAST_MATH           "Enable -ffast-math (not recommended for GCC 4.6.x)"       OFF  IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
@@ -225,17 +215,12 @@ OCV_OPTION(ENABLE_SSSE3               "Enable SSSE3 instructions"
 OCV_OPTION(ENABLE_SSE41               "Enable SSE4.1 instructions"                               OFF  IF ((CV_ICC OR CMAKE_COMPILER_IS_GNUCXX) AND (X86 OR X86_64)) )
 OCV_OPTION(ENABLE_SSE42               "Enable SSE4.2 instructions"                               OFF  IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
 OCV_OPTION(ENABLE_AVX                 "Enable AVX instructions"                                  OFF  IF ((MSVC OR CMAKE_COMPILER_IS_GNUCXX) AND (X86 OR X86_64)) )
-OCV_OPTION(ENABLE_AVX2                "Enable AVX2 instructions"                                 OFF  IF ((MSVC OR CMAKE_COMPILER_IS_GNUCXX) AND (X86 OR X86_64)) )
-OCV_OPTION(ENABLE_NEON                "Enable NEON instructions"                                 AARCH64 IF CMAKE_COMPILER_IS_GNUCXX AND (ARM OR AARCH64))
-OCV_OPTION(ENABLE_VFPV3               "Enable VFPv3-D32 instructions"                            AARCH64 IF CMAKE_COMPILER_IS_GNUCXX AND (ARM OR AARCH64))
+OCV_OPTION(ENABLE_NEON                "Enable NEON instructions"                                 OFF  IF CMAKE_COMPILER_IS_GNUCXX AND ARM )
+OCV_OPTION(ENABLE_VFPV3               "Enable VFPv3-D32 instructions"                            OFF  IF CMAKE_COMPILER_IS_GNUCXX AND ARM )
 OCV_OPTION(ENABLE_NOISY_WARNINGS      "Show all warnings even if they are too noisy"             OFF )
 OCV_OPTION(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors"                                 OFF )
 OCV_OPTION(ENABLE_WINRT_MODE          "Build with Windows Runtime support"                       OFF  IF WIN32 )
 OCV_OPTION(ENABLE_WINRT_MODE_NATIVE   "Build with Windows Runtime native C++ support"            OFF  IF WIN32 )
-OCV_OPTION(ENABLE_LIBVS2013           "Build VS2013 with Visual Studio 2013 libraries"           OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1800) )
-OCV_OPTION(ENABLE_WINSDK81            "Build VS2013 with Windows 8.1 SDK"                        OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1800) )
-OCV_OPTION(ENABLE_WINPHONESDK80       "Build with Windows Phone 8.0 SDK"                         OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1700) )
-OCV_OPTION(ENABLE_WINPHONESDK81       "Build VS2013 with Windows Phone 8.1 SDK"                  OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1800) )

 # uncategorized options
 # ===================================================
@@ -447,8 +432,6 @@ if(UNIX)
      set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
    elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly")
      set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
-      set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m)
    else()
      set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt)
    endif()
@@ -460,19 +443,6 @@ endif()
 include(cmake/OpenCVPCHSupport.cmake)
 include(cmake/OpenCVModule.cmake)

-# ----------------------------------------------------------------------------
-#  Detect endianness of build platform
-# ----------------------------------------------------------------------------
-
-if(CMAKE_SYSTEM_NAME STREQUAL iOS)
-  # test_big_endian needs try_compile, which doesn't work for iOS
-  # http://public.kitware.com/Bug/view.php?id=12288
-  set(WORDS_BIGENDIAN 0)
-else()
-  include(TestBigEndian)
-  test_big_endian(WORDS_BIGENDIAN)
-endif()
-
 # ----------------------------------------------------------------------------
 #  Detect 3rd-party libraries
 # ----------------------------------------------------------------------------
@@ -482,18 +452,14 @@ include(cmake/OpenCVFindLibsGUI.cmake)
 include(cmake/OpenCVFindLibsVideo.cmake)
 include(cmake/OpenCVFindLibsPerf.cmake)

+
 # ----------------------------------------------------------------------------
 #  Detect other 3rd-party libraries/tools
 # ----------------------------------------------------------------------------

 # --- LATEX for pdf documentation ---
-unset(HAVE_DOXYGEN CACHE)
 if(BUILD_DOCS)
  include(cmake/OpenCVFindLATEX.cmake)
-  find_host_program(DOXYGEN_BUILD doxygen)
-  if (DOXYGEN_BUILD)
-    set(HAVE_DOXYGEN 1)
-  endif (DOXYGEN_BUILD)
 endif(BUILD_DOCS)

 # --- Python Support ---
@@ -522,9 +488,6 @@ if(WITH_OPENCL)
  include(cmake/OpenCVDetectOpenCL.cmake)
 endif()

-# --- VTK support ---
-include(cmake/OpenCVDetectVTK.cmake)
-
 # ----------------------------------------------------------------------------
 # Add CUDA libraries (needed for apps/tools, samples)
 # ----------------------------------------------------------------------------
@@ -613,31 +576,23 @@ include(cmake/OpenCVGenConfig.cmake)
 include(cmake/OpenCVGenInfoPlist.cmake)

 # Generate environment setup file
-if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
+if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH AND UNIX)
  if(ANDROID)
    get_filename_component(TEST_PATH ${OPENCV_TEST_INSTALL_PATH} DIRECTORY)
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_run_all_tests_android.sh.in"
                   "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh" @ONLY)
    install(PROGRAMS "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh"
-            DESTINATION . COMPONENT tests)
-  elseif(WIN32 OR UNIX)
-    set(OPENCV_PYTHON_TESTS_LIST "")
-    if(BUILD_opencv_python)
-      file(GLOB py_tests modules/python/test/*.py)
-      install(PROGRAMS ${py_tests} DESTINATION ${OPENCV_TEST_INSTALL_PATH} COMPONENT tests)
-      set(OPENCV_PYTHON_TESTS_LIST "test2.py")
-    endif()
-    if(WIN32)
-        configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_run_all_tests_windows.cmd.in"
-                       "${CMAKE_BINARY_DIR}/win-install/opencv_run_all_tests.cmd" @ONLY)
-        install(PROGRAMS "${CMAKE_BINARY_DIR}/win-install/opencv_run_all_tests.cmd"
-                DESTINATION ${OPENCV_TEST_INSTALL_PATH} COMPONENT tests)
-    else()
-        configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_run_all_tests_unix.sh.in"
-                       "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh" @ONLY)
-        install(PROGRAMS "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh"
-                DESTINATION ${OPENCV_TEST_INSTALL_PATH} COMPONENT tests)
-    endif()
+            DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT tests)
+  else()
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_testing.sh.in"
+                   "${CMAKE_BINARY_DIR}/unix-install/opencv_testing.sh" @ONLY)
+    install(FILES "${CMAKE_BINARY_DIR}/unix-install/opencv_testing.sh"
+            DESTINATION /etc/profile.d/ COMPONENT tests)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_run_all_tests_unix.sh.in"
+                   "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh" @ONLY)
+    install(PROGRAMS "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh"
+            DESTINATION ${OPENCV_TEST_INSTALL_PATH} COMPONENT tests)
+
  endif()
 endif()

@@ -655,11 +610,11 @@ endif()
 if(ANDROID OR NOT UNIX)
  install(FILES ${OPENCV_LICENSE_FILE}
        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
-        DESTINATION . COMPONENT libs)
+        DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT libs)
  if(OPENCV_README_FILE)
    install(FILES ${OPENCV_README_FILE}
            PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
-            DESTINATION . COMPONENT libs)
+            DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT libs)
  endif()
 endif()

@@ -773,8 +728,8 @@ if(WIN32)
 status("")
    status("  Windows RT support:" HAVE_WINRT THEN YES ELSE NO)
    if (ENABLE_WINRT_MODE OR ENABLE_WINRT_MODE_NATIVE)
-      status("  Windows (Phone) SDK v8.0/v8.1:" ${WINDOWS_SDK_PATH})
-      status("  Visual Studio 2012/2013:" ${VISUAL_STUDIO_PATH})
+      status("    Windows SDK v8.0:" ${WINDOWS_SDK_PATH})
+      status("    Visual Studio 2012:" ${VISUAL_STUDIO_PATH})
    endif()
 endif(WIN32)

@@ -810,7 +765,6 @@ else()
 endif()

 status("    OpenGL support:" HAVE_OPENGL THEN "YES (${OPENGL_LIBRARIES})" ELSE NO)
-status("    VTK support:" HAVE_VTK THEN "YES (ver ${VTK_VERSION})" ELSE NO)

 # ========================== MEDIA IO ==========================
 status("")
@@ -889,12 +843,10 @@ endif(DEFINED WITH_FFMPEG)
 if(DEFINED WITH_GSTREAMER)
  status("    GStreamer:"      HAVE_GSTREAMER      THEN ""                                         ELSE NO)
  if(HAVE_GSTREAMER)
-    status("      base:"       "YES (ver ${GSTREAMER_BASE_VERSION})")
-    status("      video:"      "YES (ver ${GSTREAMER_VIDEO_VERSION})")
-    status("      app:"        "YES (ver ${GSTREAMER_APP_VERSION})")
-    status("      riff:"       "YES (ver ${GSTREAMER_RIFF_VERSION})")
-    status("      pbutils:"    "YES (ver ${GSTREAMER_PBUTILS_VERSION})")
-  endif(HAVE_GSTREAMER)
+    status("      base:"       "YES (ver ${ALIASOF_gstreamer-base-0.10_VERSION})")
+    status("      app:"        "YES (ver ${ALIASOF_gstreamer-app-0.10_VERSION})")
+    status("      video:"      "YES (ver ${ALIASOF_gstreamer-video-0.10_VERSION})")
+  endif()
 endif(DEFINED WITH_GSTREAMER)

 if(DEFINED WITH_OPENNI)
@@ -935,9 +887,8 @@ if(DEFINED WITH_V4L)
  else()
    set(HAVE_CAMV4L2_STR "NO")
  endif()
-  status("    V4L/V4L2:"       HAVE_LIBV4L
-             THEN "Using libv4l1 (ver ${ALIASOF_libv4l1_VERSION}) / libv4l2 (ver ${ALIASOF_libv4l2_VERSION})"
-             ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
+  status("    V4L/V4L2:"       HAVE_LIBV4L         THEN "Using libv4l (ver ${ALIASOF_libv4l1_VERSION})"
+                                                   ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
 endif(DEFINED WITH_V4L)

 if(DEFINED WITH_DSHOW)
@@ -1059,7 +1010,6 @@ if(BUILD_DOCS)
  endif()
  status("    Sphinx:"              HAVE_SPHINX              THEN "${SPHINX_BUILD} (ver ${SPHINX_VERSION})" ELSE NO)
  status("    PdfLaTeX compiler:"   PDFLATEX_COMPILER        THEN "${PDFLATEX_COMPILER}" ELSE NO)
-  status("    Doxygen:"             HAVE_DOXYGEN             THEN "YES (${DOXYGEN_BUILD})" ELSE NO)
 endif()

 # ========================== samples and tests ==========================
@@ -1,7 +1,5 @@
 ### OpenCV: Open Source Computer Vision Library

-[![Gittip](http://img.shields.io/gittip/OpenCV.png)](https://www.gittip.com/OpenCV/)
-
 #### Resources

 * Homepage: <http://opencv.org>
@@ -20,3 +18,6 @@ Summary of guidelines:
 * Include tests and documentation;
 * Clean up "oops" commits before submitting;
 * Follow the coding style guide.
+
+[![Donate OpenCV project](http://opencv.org/wp-content/uploads/2013/07/gittip1.png)](https://www.gittip.com/OpenCV/)
+[![Donate OpenCV project](http://opencv.org/wp-content/uploads/2013/07/paypal-donate-button.png)](https://www.paypal.com/cgi-bin/webscr?item_name=Donation+to+OpenCV&cmd=_donations&business=accountant%40opencv.org)
@@ -2,4 +2,3 @@ link_libraries(${OPENCV_LINKER_LIBS})

 add_subdirectory(haartraining)
 add_subdirectory(traincascade)
-add_subdirectory(annotation)
@@ -1,35 +0,0 @@
-SET(deps opencv_core opencv_highgui opencv_imgproc)
-ocv_check_dependencies(${deps})
-
-if(NOT OCV_DEPENDENCIES_FOUND)
-   return()
-endif()
-
-project(annotation)
-
-ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv")
-ocv_include_modules(${deps})
-
-set(the_target opencv_annotation)
-
-add_executable(${the_target} opencv_annotation.cpp)
-target_link_libraries(${the_target} ${deps})
-
-set_target_properties(${the_target} PROPERTIES
-                      DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-                      ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-                      RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-                      INSTALL_NAME_DIR lib
-                      OUTPUT_NAME "opencv_annotation")
-
-if(ENABLE_SOLUTION_FOLDERS)
-   set_target_properties(${the_target} PROPERTIES FOLDER "applications")
-endif()
-
-if(INSTALL_CREATE_DISTRIB)
-   if(BUILD_SHARED_LIBS)
-      install(TARGETS ${the_target} RUNTIME DESTINATION ${OPENCV_BIN_INSTALL_PATH} CONFIGURATIONS Release COMPONENT dev)
-   endif()
-else()
-   install(TARGETS ${the_target} RUNTIME DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT dev)
-endif()
@@ -1,196 +0,0 @@
-/*****************************************************************************************************
-USAGE:
-./opencv_annotation -images <folder location> -annotations <ouput file>
-
-Created by: Puttemans Steven
-*****************************************************************************************************/
-
-#include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
-
-#include <fstream>
-#include <iostream>
-
-using namespace std;
-using namespace cv;
-
-// Function prototypes
-void on_mouse(int, int, int, int, void*);
-string int2string(int);
-void get_annotations(Mat, stringstream*);
-
-// Public parameters
-Mat image;
-int roi_x0 = 0, roi_y0 = 0, roi_x1 = 0, roi_y1 = 0, num_of_rec = 0;
-bool start_draw = false;
-
-// Window name for visualisation purposes
-const string window_name="OpenCV Based Annotation Tool";
-
-// FUNCTION : Mouse response for selecting objects in images
-// If left button is clicked, start drawing a rectangle as long as mouse moves
-// Stop drawing once a new left click is detected by the on_mouse function
-void on_mouse(int event, int x, int y, int , void * )
-{
-    // Action when left button is clicked
-    if(event == CV_EVENT_LBUTTONDOWN)
-    {
-        if(!start_draw)
-        {
-            roi_x0 = x;
-            roi_y0 = y;
-            start_draw = true;
-        } else {
-            roi_x1 = x;
-            roi_y1 = y;
-            start_draw = false;
-        }
-    }
-    // Action when mouse is moving
-    if((event == CV_EVENT_MOUSEMOVE) && start_draw)
-    {
-        // Redraw bounding box for annotation
-        Mat current_view;
-        image.copyTo(current_view);
-        rectangle(current_view, Point(roi_x0,roi_y0), Point(x,y), Scalar(0,0,255));
-        imshow(window_name, current_view);
-    }
-}
-
-// FUNCTION : snippet to convert an integer value to a string using a clean function
-// instead of creating a stringstream each time inside the main code
-string int2string(int num)
-{
-    stringstream temp_stream;
-    temp_stream << num;
-    return temp_stream.str();
-}
-
-// FUNCTION : given an image containing positive object instances, add all the object
-// annotations to a known stringstream
-void get_annotations(Mat input_image, stringstream* output_stream)
-{
-    // Make it possible to exit the annotation
-    bool stop = false;
-
-    // Reset the num_of_rec element at each iteration
-    // Make sure the global image is set to the current image
-    num_of_rec = 0;
-    image = input_image;
-
-    // Init window interface and couple mouse actions
-    namedWindow(window_name, WINDOW_AUTOSIZE);
-    setMouseCallback(window_name, on_mouse);
-
-    imshow(window_name, image);
-    stringstream temp_stream;
-    int key_pressed = 0;
-
-    do
-    {
-        // Keys for processing
-        // You need to select one for confirming a selection and one to continue to the next image
-        // Based on the universal ASCII code of the keystroke: http://www.asciitable.com/
-        //      c = 99		    add rectangle to current image
-        //	    n = 110		    save added rectangles and show next image
-        //	    <ESC> = 27      exit program
-        key_pressed = 0xFF & waitKey(0);
-        switch( key_pressed )
-        {
-        case 27:
-                destroyWindow(window_name);
-                stop = true;
-        case 99:
-                // Add a rectangle to the list
-                num_of_rec++;
-                // Draw initiated from top left corner
-                if(roi_x0<roi_x1 && roi_y0<roi_y1)
-                {
-                    temp_stream << " " << int2string(roi_x0) << " " << int2string(roi_y0) << " " << int2string(roi_x1-roi_x0) << " " << int2string(roi_y1-roi_y0);
-                }
-                // Draw initiated from bottom right corner
-                if(roi_x0>roi_x1 && roi_y0>roi_y1)
-                {
-                    temp_stream << " " << int2string(roi_x1) << " " << int2string(roi_y1) << " " << int2string(roi_x0-roi_x1) << " " << int2string(roi_y0-roi_y1);
-                }
-                // Draw initiated from top right corner
-                if(roi_x0>roi_x1 && roi_y0<roi_y1)
-                {
-                    temp_stream << " " << int2string(roi_x1) << " " << int2string(roi_y0) << " " << int2string(roi_x0-roi_x1) << " " << int2string(roi_y1-roi_y0);
-                }
-                // Draw initiated from bottom left corner
-                if(roi_x0<roi_x1 && roi_y0>roi_y1)
-                {
-                    temp_stream << " " << int2string(roi_x0) << " " << int2string(roi_y1) << " " << int2string(roi_x1-roi_x0) << " " << int2string(roi_y0-roi_y1);
-                }
-
-                rectangle(input_image, Point(roi_x0,roi_y0), Point(roi_x1,roi_y1), Scalar(0,255,0), 1);
-
-                break;
-        }
-
-        // Check if escape has been pressed
-        if(stop)
-        {
-            break;
-        }
-    }
-    // Continue as long as the next image key has not been pressed
-    while(key_pressed != 110);
-
-    // If there are annotations AND the next image key is pressed
-    // Write the image annotations to the file
-    if(num_of_rec>0 && key_pressed==110)
-    {
-        *output_stream << " " << num_of_rec << temp_stream.str() << endl;
-    }
-
-    // Close down the window
-    destroyWindow(window_name);
-}
-
-int main( int argc, const char** argv )
-{
-    // Read in the input arguments
-    string image_folder;
-    string annotations;
-    for(int i = 1; i < argc; ++i )
-    {
-        if( !strcmp( argv[i], "-images" ) )
-        {
-            image_folder = argv[++i];
-        }
-        else if( !strcmp( argv[i], "-annotations" ) )
-        {
-            annotations = argv[++i];
-        }
-    }
-
-    // Create the outputfilestream
-    ofstream output(annotations.c_str());
-
-    // Return the image filenames inside the image folder
-    vector<String> filenames;
-    String folder(image_folder);
-    glob(folder, filenames);
-
-    // Loop through each image stored in the images folder
-    // Create and temporarily store the annotations
-    // At the end write everything to the annotations file
-    for (size_t i = 0; i < filenames.size(); i++){
-        // Read in an image
-        Mat current_image = imread(filenames[i]);
-
-        // Perform annotations & generate corresponding output
-        stringstream output_stream;
-        get_annotations(current_image, &output_stream);
-
-        // Store the annotations, write to the output file
-        if (output_stream.str() != ""){
-            output << filenames[i] << output_stream.str();
-        }
-    }
-
-    return 0;
-}
@@ -29,9 +29,6 @@ set(cvhaartraining_lib_src
  cvhaarclassifier.cpp
  cvhaartraining.cpp
  cvsamples.cpp
-  cvsamplesoutput.cpp
-  cvsamplesoutput.h
-  ioutput.h
  )

 add_library(opencv_haartraining_engine STATIC ${cvhaartraining_lib_src})
@@ -50,12 +50,10 @@
 #include <cstdlib>
 #include <cmath>
 #include <ctime>
-#include <memory>

 using namespace std;

 #include "cvhaartraining.h"
-#include "ioutput.h"

 int main( int argc, char* argv[] )
 {
@@ -73,12 +71,11 @@ int main( int argc, char* argv[] )
    double maxxangle = 1.1;
    double maxyangle = 1.1;
    double maxzangle = 0.5;
-    bool showsamples = false;
+    int showsamples = 0;
    /* the samples are adjusted to this scale in the sample preview window */
    double scale = 4.0;
    int width  = 24;
    int height = 24;
-    bool pngoutput = false; /* whether to make the samples in png or in jpg*/

    srand((unsigned int)time(0));

@@ -95,8 +92,7 @@ int main( int argc, char* argv[] )
                "  [-maxyangle <max_y_rotation_angle = %f>]\n"
                "  [-maxzangle <max_z_rotation_angle = %f>]\n"
                "  [-show [<scale = %f>]]\n"
-                "  [-w <sample_width = %d>]\n  [-h <sample_height = %d>]\n"
-                "  [-pngoutput]",
+                "  [-w <sample_width = %d>]\n  [-h <sample_height = %d>]\n",
                argv[0], num, bgcolor, bgthreshold, maxintensitydev,
                maxxangle, maxyangle, maxzangle, scale, width, height );

@@ -159,7 +155,7 @@ int main( int argc, char* argv[] )
        }
        else if( !strcmp( argv[i], "-show" ) )
        {
-            showsamples = true;
+            showsamples = 1;
            if( i+1 < argc && strlen( argv[i+1] ) > 0 && argv[i+1][0] != '-' )
            {
                double d;
@@ -176,10 +172,6 @@ int main( int argc, char* argv[] )
        {
            height = atoi( argv[++i] );
        }
-        else if( !strcmp( argv[i], "-pngoutput" ) )
-        {
-            pngoutput = true;
-        }
    }

    printf( "Info file name: %s\n", ((infoname == NULL) ?   nullname : infoname ) );
@@ -198,14 +190,10 @@ int main( int argc, char* argv[] )
    printf( "Show samples: %s\n", (showsamples) ? "TRUE" : "FALSE" );
    if( showsamples )
    {
-        printf( "Scale applied to display : %g\n", scale );
-    }
-    if( !pngoutput)
-    {
-        printf( "Original image will be scaled to:\n");
-        printf( "\tWidth: $backgroundWidth / %d\n", width );
-        printf( "\tHeight: $backgroundHeight / %d\n", height );
+        printf( "Scale: %g\n", scale );
    }
+    printf( "Width: %d\n", width );
+    printf( "Height: %d\n", height );

    /* determine action */
    if( imagename && vecname )
@@ -219,24 +207,13 @@ int main( int argc, char* argv[] )

        printf( "Done\n" );
    }
-    else if( imagename && bgfilename && infoname)
+    else if( imagename && bgfilename && infoname )
    {
-        printf( "Create data set from single image applying distortions...\n"
-                "Output format: %s\n",
-                (( pngoutput ) ? "PNG" : "JPG") );
+        printf( "Create test samples from single image applying distortions...\n" );

-        std::auto_ptr<DatasetGenerator> creator;
-        if( pngoutput )
-        {
-            creator = std::auto_ptr<DatasetGenerator>( new PngDatasetGenerator( infoname ) );
-        }
-        else
-        {
-            creator = std::auto_ptr<DatasetGenerator>( new JpgDatasetGenerator( infoname ) );
-        }
-        creator->create( imagename, bgcolor, bgthreshold, bgfilename, num,
-                        invert, maxintensitydev, maxxangle, maxyangle, maxzangle,
-                        showsamples, width, height );
+        cvCreateTestSamples( infoname, imagename, bgcolor, bgthreshold, bgfilename, num,
+            invert, maxintensitydev,
+            maxxangle, maxyangle, maxzangle, showsamples, width, height );

        printf( "Done\n" );
    }
@@ -338,7 +338,7 @@ typedef enum CvBoostType
    CV_LKCLASS  = 5, /* classification (K class problem)    */
    CV_LSREG    = 6, /* least squares regression            */
    CV_LADREG   = 7, /* least absolute deviation regression */
-    CV_MREG     = 8  /* M-regression (Huber loss)           */
+    CV_MREG     = 8, /* M-regression (Huber loss)           */
 } CvBoostType;

 /****************************************************************************************\
@@ -48,8 +48,6 @@
 #include "cvhaartraining.h"
 #include "_cvhaartraining.h"

-#include "ioutput.h"
-
 #include <cstdio>
 #include <cstdlib>
 #include <cmath>
@@ -2843,12 +2841,14 @@ void cvCreateTreeCascadeClassifier( const char* dirname,
    cvReleaseMat( &features_idx );
 }

+
+
 void cvCreateTrainingSamples( const char* filename,
                              const char* imgfilename, int bgcolor, int bgthreshold,
                              const char* bgfilename, int count,
                              int invert, int maxintensitydev,
                              double maxxangle, double maxyangle, double maxzangle,
-                              bool showsamples,
+                              int showsamples,
                              int winwidth, int winheight )
 {
    CvSampleDistortionData data;
@@ -2915,7 +2915,7 @@ void cvCreateTrainingSamples( const char* filename,
                    cvShowImage( "Sample", &sample );
                    if( cvWaitKey( 0 ) == 27 )
                    {
-                        showsamples = false;
+                        showsamples = 0;
                    }
                }

@@ -2942,43 +2942,45 @@ void cvCreateTrainingSamples( const char* filename,

 }

-DatasetGenerator::DatasetGenerator( IOutput* _writer )
-    :writer(_writer)
-{
+#define CV_INFO_FILENAME "info.dat"

-}

-void DatasetGenerator::showSamples(bool* show, CvMat *img) const
-{
-    if( *show )
-    {
-        cvShowImage( "Image", img);
-        if( cvWaitKey( 0 ) == 27 )
-        {
-            *show = false;
-        }
-    }
-}
-
-void DatasetGenerator::create(const char* imgfilename, int bgcolor, int bgthreshold,
-                              const char* bgfilename, int count,
-                              int invert, int maxintensitydev,
-                              double maxxangle, double maxyangle, double maxzangle,
-                              bool showsamples,
-                              int winwidth, int winheight )
+void cvCreateTestSamples( const char* infoname,
+                          const char* imgfilename, int bgcolor, int bgthreshold,
+                          const char* bgfilename, int count,
+                          int invert, int maxintensitydev,
+                          double maxxangle, double maxyangle, double maxzangle,
+                          int showsamples,
+                          int winwidth, int winheight )
 {
    CvSampleDistortionData data;

+    assert( infoname != NULL );
    assert( imgfilename != NULL );
    assert( bgfilename != NULL );

+    if( !icvMkDir( infoname ) )
+    {
+
+#if CV_VERBOSE
+        fprintf( stderr, "Unable to create directory hierarchy: %s\n", infoname );
+#endif /* CV_VERBOSE */
+
+        return;
+    }
    if( icvStartSampleDistortion( imgfilename, bgcolor, bgthreshold, &data ) )
    {
+        char fullname[PATH_MAX];
+        char* filename;
        CvMat win;
+        FILE* info;

        if( icvInitBackgroundReaders( bgfilename, cvSize( 10, 10 ) ) )
        {
            int i;
+            int x, y, width, height;
+            float scale;
+            float maxscale;
            int inverse;

            if( showsamples )
@@ -2986,112 +2988,73 @@ void DatasetGenerator::create(const char* imgfilename, int bgcolor, int bgthresh
                cvNamedWindow( "Image", CV_WINDOW_AUTOSIZE );
            }

+            info = fopen( infoname, "w" );
+            strcpy( fullname, infoname );
+            filename = strrchr( fullname, '\\' );
+            if( filename == NULL )
+            {
+                filename = strrchr( fullname, '/' );
+            }
+            if( filename == NULL )
+            {
+                filename = fullname;
+            }
+            else
+            {
+                filename++;
+            }
+
            count = MIN( count, cvbgdata->count );
            inverse = invert;
-
            for( i = 0; i < count; i++ )
            {
                icvGetNextFromBackgroundData( cvbgdata, cvbgreader );

-                CvRect boundingBox = getObjectPosition( cvSize( cvbgreader->src.cols,
-                                                                cvbgreader->src.rows ),
-                                                        cvGetSize(data.img),
-                                                        cvSize( winwidth, winheight ) );
-                if(boundingBox.width <= 0 || boundingBox.height <= 0)
-                {
-                    continue;
-                }
+                maxscale = MIN( 0.7F * cvbgreader->src.cols / winwidth,
+                                   0.7F * cvbgreader->src.rows / winheight );
+                if( maxscale < 1.0F ) continue;

-                cvGetSubArr( &cvbgreader->src, &win, boundingBox );
+                scale = (maxscale - 1.0F) * rand() / RAND_MAX + 1.0F;
+                width = (int) (scale * winwidth);
+                height = (int) (scale * winheight);
+                x = (int) ((0.1+0.8 * rand()/RAND_MAX) * (cvbgreader->src.cols - width));
+                y = (int) ((0.1+0.8 * rand()/RAND_MAX) * (cvbgreader->src.rows - height));

+                cvGetSubArr( &cvbgreader->src, &win, cvRect( x, y ,width, height ) );
                if( invert == CV_RANDOM_INVERT )
                {
                    inverse = (rand() > (RAND_MAX/2));
                }
-
                icvPlaceDistortedSample( &win, inverse, maxintensitydev,
                                         maxxangle, maxyangle, maxzangle,
                                         1, 0.0, 0.0, &data );

-                writer->write( cvbgreader->src, boundingBox );

-                showSamples(&showsamples, &cvbgreader->src);
+                sprintf( filename, "%04d_%04d_%04d_%04d_%04d.jpg",
+                         (i + 1), x, y, width, height );
+
+                if( info )
+                {
+                    fprintf( info, "%s %d %d %d %d %d\n",
+                        filename, 1, x, y, width, height );
+                }
+
+                cvSaveImage( fullname, &cvbgreader->src );
+                if( showsamples )
+                {
+                    cvShowImage( "Image", &cvbgreader->src );
+                    if( cvWaitKey( 0 ) == 27 )
+                    {
+                        showsamples = 0;
+                    }
+                }
            }
+            if( info ) fclose( info );
            icvDestroyBackgroundReaders();
        }
        icvEndSampleDistortion( &data );
    }
 }

-DatasetGenerator::~DatasetGenerator()
-{
-    delete writer;
-}
-
-
-JpgDatasetGenerator::JpgDatasetGenerator( const char* filename )
-    :DatasetGenerator( IOutput::createOutput( filename, IOutput::JPG_DATASET ) )
-{
-}
-
-CvSize JpgDatasetGenerator::scaleObjectSize( const CvSize& bgImgSize,
-                                             const CvSize& ,
-                                             const CvSize& sampleSize) const
-{
-    float scale;
-    float maxscale;
-
-    maxscale = MIN( 0.7F * bgImgSize.width / sampleSize.width,
-                    0.7F * bgImgSize.height / sampleSize.height );
-    if( maxscale < 1.0F )
-    {
-        scale = -1.f;
-    }
-    else
-    {
-        scale = (maxscale - 1.0F) * rand() / RAND_MAX + 1.0F;
-    }
-
-    int width = (int) (scale * sampleSize.width);
-    int height = (int) (scale * sampleSize.height);
-
-    return cvSize( width, height );
-}
-
-CvRect DatasetGenerator::getObjectPosition(const CvSize& bgImgSize,
-                                           const CvSize& imgSize,
-                                           const CvSize& sampleSize) const
-{
-    CvSize size = scaleObjectSize( bgImgSize, imgSize, sampleSize );
-
-    int width = size.width;
-    int height = size.height;
-    int x = (int) ((0.1 + 0.8 * rand() / RAND_MAX) * (bgImgSize.width - width));
-    int y = (int) ((0.1 + 0.8 * rand() / RAND_MAX) * (bgImgSize.height - height));
-
-    return cvRect( x, y, width, height );
-}
-
-
-PngDatasetGenerator::PngDatasetGenerator(const char* filename)
-    :DatasetGenerator( IOutput::createOutput( filename, IOutput::PNG_DATASET ) )
-{
-}
-
-CvSize PngDatasetGenerator::scaleObjectSize( const CvSize& bgImgSize,
-                                             const CvSize& imgSize,
-                                             const CvSize& ) const
-{
-    float scale;
-
-    scale = MIN( 0.3F * bgImgSize.width / imgSize.width,
-                 0.3F * bgImgSize.height / imgSize.height );
-
-
-    int width = (int) (scale * imgSize.width);
-    int height = (int) (scale * imgSize.height);
-
-    return cvSize( width, height );
-}

 /* End of file. */
@@ -48,11 +48,6 @@
 #ifndef _CVHAARTRAINING_H_
 #define _CVHAARTRAINING_H_

-class IOutput;
-struct CvRect;
-struct CvSize;
-struct CvMat;
-
 /*
 * cvCreateTrainingSamples
 *
@@ -79,30 +74,23 @@ struct CvMat;
 */
 #define CV_RANDOM_INVERT 0x7FFFFFFF

-void cvCreateTrainingSamples(const char* filename,
+void cvCreateTrainingSamples( const char* filename,
                              const char* imgfilename, int bgcolor, int bgthreshold,
                              const char* bgfilename, int count,
                              int invert = 0, int maxintensitydev = 40,
                              double maxxangle = 1.1,
                              double maxyangle = 1.1,
                              double maxzangle = 0.5,
-                              bool showsamples = false,
+                              int showsamples = 0,
                              int winwidth = 24, int winheight = 24 );

-void cvCreatePngTrainingSet(const char* imgfilename, int bgcolor, int bgthreshold,
-                            const char* bgfilename, int count,
-                            int invert, int maxintensitydev,
-                            double maxxangle, double maxyangle, double maxzangle,
-                            int winwidth, int winheight,
-                            IOutput *writer );
-
-void cvCreateTestSamples(const char* imgfilename, int bgcolor, int bgthreshold,
+void cvCreateTestSamples( const char* infoname,
+                          const char* imgfilename, int bgcolor, int bgthreshold,
                          const char* bgfilename, int count,
                          int invert, int maxintensitydev,
                          double maxxangle, double maxyangle, double maxzangle,
                          int showsamples,
-                          int winwidth, int winheight,
-                          IOutput* writer);
+                          int winwidth, int winheight );

 /*
 * cvCreateTrainingSamplesFromInfo
@@ -201,50 +189,4 @@ void cvCreateTreeCascadeClassifier( const char* dirname,
                                    int boosttype, int stumperror,
                                    int maxtreesplits, int minpos, bool bg_vecfile = false );

-
-class DatasetGenerator
-{
-public:
-    DatasetGenerator( IOutput* _writer );
-    void create( const char* imgfilename, int bgcolor, int bgthreshold,
-                 const char* bgfilename, int count,
-                 int invert, int maxintensitydev,
-                 double maxxangle, double maxyangle, double maxzangle,
-                 bool showsamples,
-                 int winwidth, int winheight);
-    virtual ~DatasetGenerator();
-private:
-    virtual void showSamples( bool* showSamples, CvMat* img ) const;
-
-    CvRect getObjectPosition( const CvSize& bgImgSize,
-                              const CvSize& imgSize,
-                              const CvSize& sampleSize ) const;
-    virtual CvSize scaleObjectSize(const CvSize& bgImgSize,
-                                   const CvSize& imgSize ,
-                                   const CvSize& sampleSize) const =0 ;
-private:
-    IOutput* writer;
-};
-
-/* Provides the functionality of test set generating */
-class JpgDatasetGenerator: public DatasetGenerator
-{
-public:
-    JpgDatasetGenerator(const char* filename);
-private:
-    CvSize scaleObjectSize(const CvSize& bgImgSize,
-                           const CvSize& ,
-                           const CvSize& sampleSize) const;
-};
-
-class PngDatasetGenerator: public DatasetGenerator
-{
-public:
-    PngDatasetGenerator(const char *filename);
-private:
-    CvSize scaleObjectSize(const CvSize& bgImgSize,
-                           const CvSize& imgSize ,
-                           const CvSize& ) const;
-};
-
 #endif /* _CVHAARTRAINING_H_ */
@@ -1,227 +0,0 @@
-#include "cvsamplesoutput.h"
-
-#include <cstdio>
-
-#include "_cvcommon.h"
-#include "highgui.h"
-
-/* print statistic info */
-#define CV_VERBOSE 1
-
-IOutput::IOutput()
-    : currentIdx(0)
-{}
-
-void IOutput::findFilePathPart(char **partOfPath, char *fullPath)
-{
-    *partOfPath = strrchr( fullPath, '\\' );
-    if( *partOfPath == NULL )
-    {
-        *partOfPath = strrchr( fullPath, '/' );
-    }
-    if( *partOfPath == NULL )
-    {
-        *partOfPath = fullPath;
-    }
-    else
-    {
-        *partOfPath += 1;
-    }
-}
-
-IOutput* IOutput::createOutput(const char *filename,
-                               IOutput::OutputType type)
-{
-    IOutput* output = 0;
-    switch (type) {
-    case IOutput::PNG_DATASET:
-        output = new PngDatasetOutput();
-        break;
-    case IOutput::JPG_DATASET:
-        output = new JpgDatasetOutput();
-        break;
-    default:
-#if CV_VERBOSE
-        fprintf( stderr, "Invalid output type, valid types are: PNG_TRAINING_SET, JPG_TEST_SET");
-#endif /* CV_VERBOSE */
-        return 0;
-    }
-
-    if ( output->init( filename ) )
-        return output;
-    else
-        return 0;
-}
-
-bool PngDatasetOutput::init( const char* annotationsListFileName )
-{
-    IOutput::init( annotationsListFileName );
-
-    if(imgFileName == imgFullPath)
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Invalid path to annotations file: %s\n"
-                                 "It should contain a parent directory name\n", imgFullPath );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-
-
-    const char* annotationsdirname = "/annotations/";
-    const char* positivesdirname = "/pos/";
-
-    imgFileName[-1] = '\0'; //erase slash at the end of the path
-    imgFileName -= 1;
-
-    //copy path to dataset top-level dir
-    strcpy(annotationFullPath, imgFullPath);
-    //find the name of annotation starting from the top-level dataset dir
-    findFilePathPart(&annotationRelativePath, annotationFullPath);
-    if( !strcmp( annotationRelativePath, ".." ) || !strcmp( annotationRelativePath, "." ) )
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Invalid path to annotations file: %s\n"
-                                 "It should contain a parent directory name\n", annotationsListFileName );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-    //find the name of output image starting from the top-level dataset dir
-    findFilePathPart(&imgRelativePath, imgFullPath);
-    annotationFileName = annotationFullPath + strlen(annotationFullPath);
-
-    sprintf(annotationFileName, "%s", annotationsdirname);
-    annotationFileName += strlen(annotationFileName);
-    sprintf(imgFileName, "%s", positivesdirname);
-    imgFileName += strlen(imgFileName);
-
-    if( !icvMkDir( annotationFullPath ) )
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Unable to create directory hierarchy: %s\n", annotationFullPath );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-    if( !icvMkDir( imgFullPath ) )
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Unable to create directory hierarchy: %s\n", imgFullPath );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-
-    return true;
-}
-
-bool PngDatasetOutput::write( const CvMat& img,
-                              const CvRect& boundingBox )
-{
-    CvRect bbox = addBoundingboxBorder(boundingBox);
-
-    sprintf( imgFileName,
-             "%04d_%04d_%04d_%04d_%04d",
-             ++currentIdx,
-             bbox.x,
-             bbox.y,
-             bbox.width,
-             bbox.height );
-
-    sprintf( annotationFileName, "%s.txt", imgFileName );
-    fprintf( annotationsList, "%s\n", annotationRelativePath );
-
-    FILE* annotationFile = fopen( annotationFullPath, "w" );
-    if(annotationFile == 0)
-    {
-        return false;
-    }
-
-    sprintf( imgFileName + strlen(imgFileName), ".%s", extension );
-
-
-
-    fprintf( annotationFile,
-             "Image filename : \"%s\"\n"
-             "Bounding box for object 1 \"PASperson\" (Xmin, Ymin) - (Xmax, Ymax) : (%d, %d) - (%d, %d)",
-             imgRelativePath,
-             bbox.x,
-             bbox.y,
-             bbox.x + bbox.width,
-             bbox.y + bbox.height );
-    fclose( annotationFile );
-
-    cvSaveImage( imgFullPath, &img);
-
-    return true;
-}
-
-CvRect PngDatasetOutput::addBoundingboxBorder(const CvRect& bbox) const
-{
-    CvRect boundingBox = bbox;
-    int border = 5;
-
-    boundingBox.x -= border;
-    boundingBox.y -= border;
-    boundingBox.width += 2*border;
-    boundingBox.height += 2*border;
-
-    return boundingBox;
-}
-
-IOutput::~IOutput()
-{
-    if(annotationsList)
-    {
-        fclose(annotationsList);
-    }
-}
-
-bool IOutput::init(const char *filename)
-{
-    assert( filename != NULL );
-
-    if( !icvMkDir( filename ) )
-    {
-
-#if CV_VERBOSE
-        fprintf( stderr, "Unable to create directory hierarchy: %s\n", filename );
-#endif /* CV_VERBOSE */
-
-        return false;
-    }
-
-    annotationsList = fopen( filename, "w" );
-    if( annotationsList == NULL )
-    {
-#if CV_VERBOSE
-        fprintf( stderr, "Unable to create info file: %s\n", filename );
-#endif /* CV_VERBOSE */
-        return false;
-    }
-    strcpy( imgFullPath, filename );
-
-    findFilePathPart( &imgFileName, imgFullPath );
-
-    return true;
-}
-
-bool JpgDatasetOutput::write( const CvMat& img,
-                               const CvRect& boundingBox )
-{
-    sprintf( imgFileName, "%04d_%04d_%04d_%04d_%04d.jpg",
-             ++currentIdx,
-             boundingBox.x,
-             boundingBox.y,
-             boundingBox.width,
-             boundingBox.height );
-
-   fprintf( annotationsList, "%s %d %d %d %d %d\n",
-            imgFileName,
-            1,
-            boundingBox.x,
-            boundingBox.y,
-            boundingBox.width,
-            boundingBox.height );
-
-    cvSaveImage( imgFullPath, &img);
-
-    return true;
-}
@@ -1,46 +0,0 @@
-#ifndef CVSAMPLESOUTPUT_H
-#define CVSAMPLESOUTPUT_H
-
-#include "ioutput.h"
-
-class PngDatasetOutput: public IOutput
-{
-    friend IOutput* IOutput::createOutput(const char *filename, OutputType type);
-public:
-    virtual bool write( const CvMat& img,
-                        const CvRect& boundingBox);
-
-    virtual ~PngDatasetOutput(){}
-private:
-    PngDatasetOutput()
-        : extension("png")
-        , destImgWidth(640)
-        , destImgHeight(480)
-    {}
-
-    virtual bool init(const char* annotationsListFileName );
-
-    CvRect addBoundingboxBorder(const CvRect& bbox) const;
-private:
-
-    char annotationFullPath[PATH_MAX];
-    char* annotationFileName;
-    char* annotationRelativePath;
-    char* imgRelativePath;
-    const char* extension;
-
-    int destImgWidth;
-    int destImgHeight ;
-};
-
-class JpgDatasetOutput: public IOutput
-{
-    friend IOutput* IOutput::createOutput(const char *filename, OutputType type);
-public:
-    virtual bool write( const CvMat& img,
-                        const CvRect& boundingBox );
-    virtual ~JpgDatasetOutput(){}
-private:
-    JpgDatasetOutput(){}
-};
-#endif // CVSAMPLESOUTPUT_H
@@ -1,34 +0,0 @@
-#ifndef IOUTPUT_H
-#define IOUTPUT_H
-
-#include <cstdio>
-
-#include "_cvcommon.h"
-
-struct CvMat;
-struct CvRect;
-
-class IOutput
-{
-public:
-    enum OutputType {PNG_DATASET, JPG_DATASET};
-public:
-    virtual bool write( const CvMat& img,
-                        const CvRect& boundingBox ) =0;
-
-    virtual ~IOutput();
-
-    static IOutput* createOutput( const char *filename, OutputType type );
-protected:
-    IOutput();
-    /* finds the beginning of the last token in the path */
-    void findFilePathPart( char **partOfPath, char *fullPath );
-    virtual bool init( const char* filename );
-protected:
-    int  currentIdx;
-    char imgFullPath[PATH_MAX];
-    char* imgFileName;
-    FILE* annotationsList;
-};
-
-#endif // IOUTPUT_H
@@ -169,13 +169,6 @@ bool CvCascadeClassifier::train( const string _cascadeDirName,
        featureEvaluator = CvFeatureEvaluator::create(cascadeParams.featureType);
        featureEvaluator->init( (CvFeatureParams*)featureParams, numPos + numNeg, cascadeParams.winSize );
        stageClassifiers.reserve( numStages );
-    }else{
-        // Make sure that if model parameters are preloaded, that people are aware of this,
-        // even when passing other parameters to the training command
-        cout << "---------------------------------------------------------------------------------" << endl;
-        cout << "Training parameters are pre-loaded from the parameter file in data folder!" << endl;
-        cout << "Please empty this folder if you want to use a NEW set of training parameters." << endl;
-        cout << "---------------------------------------------------------------------------------" << endl;
    }
    cout << "PARAMETERS:" << endl;
    cout << "cascadeDirName: " << _cascadeDirName << endl;
@@ -205,7 +198,7 @@ bool CvCascadeClassifier::train( const string _cascadeDirName,
        cout << endl << "===== TRAINING " << i << "-stage =====" << endl;
        cout << "<BEGIN" << endl;

-        if ( !updateTrainingSet( requiredLeafFARate, tempLeafFARate ) )
+        if ( !updateTrainingSet( tempLeafFARate ) )
        {
            cout << "Train dataset for temp stage can not be filled. "
                "Branch training terminated." << endl;
@@ -291,17 +284,17 @@ int CvCascadeClassifier::predict( int sampleIdx )
    return 1;
 }

-bool CvCascadeClassifier::updateTrainingSet( double minimumAcceptanceRatio, double& acceptanceRatio)
+bool CvCascadeClassifier::updateTrainingSet( double& acceptanceRatio)
 {
    int64 posConsumed = 0, negConsumed = 0;
    imgReader.restart();
-    int posCount = fillPassedSamples( 0, numPos, true, 0, posConsumed );
+    int posCount = fillPassedSamples( 0, numPos, true, posConsumed );
    if( !posCount )
        return false;
    cout << "POS count : consumed   " << posCount << " : " << (int)posConsumed << endl;

    int proNumNeg = cvRound( ( ((double)numNeg) * ((double)posCount) ) / numPos ); // apply only a fraction of negative samples. double is required since overflow is possible
-    int negCount = fillPassedSamples( posCount, proNumNeg, false, minimumAcceptanceRatio, negConsumed );
+    int negCount = fillPassedSamples( posCount, proNumNeg, false, negConsumed );
    if ( !negCount )
        return false;

@@ -311,7 +304,7 @@ bool CvCascadeClassifier::updateTrainingSet( double minimumAcceptanceRatio, doub
    return true;
 }

-int CvCascadeClassifier::fillPassedSamples( int first, int count, bool isPositive, double minimumAcceptanceRatio, int64& consumed )
+int CvCascadeClassifier::fillPassedSamples( int first, int count, bool isPositive, int64& consumed )
 {
    int getcount = 0;
    Mat img(cascadeParams.winSize, CV_8UC1);
@@ -319,9 +312,6 @@ int CvCascadeClassifier::fillPassedSamples( int first, int count, bool isPositiv
    {
        for( ; ; )
        {
-            if( consumed != 0 && ((double)getcount+1)/(double)(int64)consumed <= minimumAcceptanceRatio )
-                return getcount;
-
            bool isGetImg = isPositive ? imgReader.getPos( img ) :
                                           imgReader.getNeg( img );
            if( !isGetImg )
@@ -101,8 +101,8 @@ private:
    int predict( int sampleIdx );
    void save( const std::string cascadeDirName, bool baseFormat = false );
    bool load( const std::string cascadeDirName );
-    bool updateTrainingSet( double minimumAcceptanceRatio, double& acceptanceRatio );
-    int fillPassedSamples( int first, int count, bool isPositive, double requiredAcceptanceRatio, int64& consumed );
+    bool updateTrainingSet( double& acceptanceRatio );
+    int fillPassedSamples( int first, int count, bool isPositive, int64& consumed );

    void writeParams( cv::FileStorage &fs ) const;
    void writeStages( cv::FileStorage &fs, const cv::Mat& featureMap ) const;
@@ -1,11 +1,10 @@
 #ifndef _OPENCV_IMAGESTORAGE_H_
 #define _OPENCV_IMAGESTORAGE_H_

-#include <stdio.h>
-#include <string>
-#include <vector>
 #include "highgui.h"

+
+
 class CvCascadeImageReader
 {
 public:
@@ -31,8 +31,10 @@
 # The following variables affect the behavior of the macros in the
 # script (in alphebetical order).  Note that any of these flags can be
 # changed multiple times in the same directory before calling
-# CUDA_ADD_EXECUTABLE, CUDA_ADD_LIBRARY, CUDA_COMPILE, CUDA_COMPILE_PTX,
-# CUDA_COMPILE_FATBIN, CUDA_COMPILE_CUBIN or CUDA_WRAP_SRCS::
+# CUDA_ADD_EXECUTABLE, CUDA_ADD_LIBRARY, CUDA_COMPILE, CUDA_COMPILE_PTX
+# or CUDA_WRAP_SRCS.
+#
+# ::
 #
 #   CUDA_64_BIT_DEVICE_CODE (Default matches host bit size)
 #   -- Set to ON to compile for 64 bit device code, OFF for 32 bit device code.
@@ -41,11 +43,19 @@
 #      nvcc in the generated source.  If you compile to PTX and then load the
 #      file yourself, you can mix bit sizes between device and host.
 #
+#
+#
+# ::
+#
 #   CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE (Default ON)
 #   -- Set to ON if you want the custom build rule to be attached to the source
 #      file in Visual Studio.  Turn OFF if you add the same cuda file to multiple
 #      targets.
 #
+#
+#
+# ::
+#
 #      This allows the user to build the target from the CUDA file; however, bad
 #      things can happen if the CUDA source file is added to multiple targets.
 #      When performing parallel builds it is possible for the custom build
@@ -58,24 +68,44 @@
 #      this script could detect the reuse of source files across multiple targets
 #      and turn the option off for the user, but no good solution could be found.
 #
+#
+#
+# ::
+#
 #   CUDA_BUILD_CUBIN (Default OFF)
 #   -- Set to ON to enable and extra compilation pass with the -cubin option in
 #      Device mode. The output is parsed and register, shared memory usage is
 #      printed during build.
 #
+#
+#
+# ::
+#
 #   CUDA_BUILD_EMULATION (Default OFF for device mode)
 #   -- Set to ON for Emulation mode. -D_DEVICEEMU is defined for CUDA C files
 #      when CUDA_BUILD_EMULATION is TRUE.
 #
+#
+#
+# ::
+#
 #   CUDA_GENERATED_OUTPUT_DIR (Default CMAKE_CURRENT_BINARY_DIR)
 #   -- Set to the path you wish to have the generated files placed.  If it is
 #      blank output files will be placed in CMAKE_CURRENT_BINARY_DIR.
 #      Intermediate files will always be placed in
 #      CMAKE_CURRENT_BINARY_DIR/CMakeFiles.
 #
+#
+#
+# ::
+#
 #   CUDA_HOST_COMPILATION_CPP (Default ON)
 #   -- Set to OFF for C compilation of host code.
 #
+#
+#
+# ::
+#
 #   CUDA_HOST_COMPILER (Default CMAKE_C_COMPILER, $(VCInstallDir)/bin for VS)
 #   -- Set the host compiler to be used by nvcc.  Ignored if -ccbin or
 #      --compiler-bindir is already present in the CUDA_NVCC_FLAGS or
@@ -83,11 +113,19 @@
 #      $(VCInstallDir)/bin is a special value that expands out to the path when
 #      the command is run from withing VS.
 #
+#
+#
+# ::
+#
 #   CUDA_NVCC_FLAGS
 #   CUDA_NVCC_FLAGS_<CONFIG>
 #   -- Additional NVCC command line arguments.  NOTE: multiple arguments must be
 #      semi-colon delimited (e.g. --compiler-options;-Wall)
 #
+#
+#
+# ::
+#
 #   CUDA_PROPAGATE_HOST_FLAGS (Default ON)
 #   -- Set to ON to propagate CMAKE_{C,CXX}_FLAGS and their configuration
 #      dependent counterparts (e.g. CMAKE_C_FLAGS_DEBUG) automatically to the
@@ -99,6 +137,10 @@
 #      CUDA_ADD_LIBRARY, CUDA_ADD_EXECUTABLE, or CUDA_WRAP_SRCS.  Flags used for
 #      shared library compilation are not affected by this flag.
 #
+#
+#
+# ::
+#
 #   CUDA_SEPARABLE_COMPILATION (Default OFF)
 #   -- If set this will enable separable compilation for all CUDA runtime object
 #      files.  If used outside of CUDA_ADD_EXECUTABLE and CUDA_ADD_LIBRARY
@@ -106,22 +148,38 @@
 #      CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and
 #      CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS should be called.
 #
+#
+#
+# ::
+#
 #   CUDA_VERBOSE_BUILD (Default OFF)
 #   -- Set to ON to see all the commands used when building the CUDA file.  When
 #      using a Makefile generator the value defaults to VERBOSE (run make
 #      VERBOSE=1 to see output), although setting CUDA_VERBOSE_BUILD to ON will
 #      always print the output.
 #
-# The script creates the following macros (in alphebetical order)::
+#
+#
+# The script creates the following macros (in alphebetical order):
+#
+# ::
 #
 #   CUDA_ADD_CUFFT_TO_TARGET( cuda_target )
 #   -- Adds the cufft library to the target (can be any target).  Handles whether
 #      you are in emulation mode or not.
 #
+#
+#
+# ::
+#
 #   CUDA_ADD_CUBLAS_TO_TARGET( cuda_target )
 #   -- Adds the cublas library to the target (can be any target).  Handles
 #      whether you are in emulation mode or not.
 #
+#
+#
+# ::
+#
 #   CUDA_ADD_EXECUTABLE( cuda_target file0 file1 ...
 #                        [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL] [OPTIONS ...] )
 #   -- Creates an executable "cuda_target" which is made up of the files
@@ -135,28 +193,42 @@
 #      nvcc.  Such flags should be modified before calling CUDA_ADD_EXECUTABLE,
 #      CUDA_ADD_LIBRARY or CUDA_WRAP_SRCS.
 #
+#
+#
+# ::
+#
 #   CUDA_ADD_LIBRARY( cuda_target file0 file1 ...
 #                     [STATIC | SHARED | MODULE] [EXCLUDE_FROM_ALL] [OPTIONS ...] )
 #   -- Same as CUDA_ADD_EXECUTABLE except that a library is created.
 #
+#
+#
+# ::
+#
 #   CUDA_BUILD_CLEAN_TARGET()
 #   -- Creates a convience target that deletes all the dependency files
 #      generated.  You should make clean after running this target to ensure the
 #      dependency files get regenerated.
 #
+#
+#
+# ::
+#
 #   CUDA_COMPILE( generated_files file0 file1 ... [STATIC | SHARED | MODULE]
 #                 [OPTIONS ...] )
 #   -- Returns a list of generated files from the input source files to be used
 #      with ADD_LIBRARY or ADD_EXECUTABLE.
 #
+#
+#
+# ::
+#
 #   CUDA_COMPILE_PTX( generated_files file0 file1 ... [OPTIONS ...] )
 #   -- Returns a list of PTX files generated from the input source files.
 #
-#   CUDA_COMPILE_FATBIN( generated_files file0 file1 ... [OPTIONS ...] )
-#   -- Returns a list of FATBIN files generated from the input source files.
 #
-#   CUDA_COMPILE_CUBIN( generated_files file0 file1 ... [OPTIONS ...] )
-#   -- Returns a list of CUBIN files generated from the input source files.
+#
+# ::
 #
 #   CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME( output_file_var
 #                                                        cuda_target
@@ -170,6 +242,10 @@
 #      automatically for CUDA_ADD_LIBRARY and CUDA_ADD_EXECUTABLE.  Note that
 #      this is a function and not a macro.
 #
+#
+#
+# ::
+#
 #   CUDA_INCLUDE_DIRECTORIES( path0 path1 ... )
 #   -- Sets the directories that should be passed to nvcc
 #      (e.g. nvcc -Ipath0 -Ipath1 ... ). These paths usually contain other .cu
@@ -177,9 +253,17 @@
 #
 #
 #
+#
+#
+# ::
+#
 #   CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS( output_file_var cuda_target
 #                                            nvcc_flags object_files)
 #
+#
+#
+# ::
+#
 #   -- Generates the link object required by separable compilation from the given
 #      object files.  This is called automatically for CUDA_ADD_EXECUTABLE and
 #      CUDA_ADD_LIBRARY, but can be called manually when using CUDA_WRAP_SRCS
@@ -189,51 +273,91 @@
 #      specified by CUDA_64_BIT_DEVICE_CODE.  Note that this is a function
 #      instead of a macro.
 #
+#
+#
+# ::
+#
 #   CUDA_WRAP_SRCS ( cuda_target format generated_files file0 file1 ...
 #                    [STATIC | SHARED | MODULE] [OPTIONS ...] )
 #   -- This is where all the magic happens.  CUDA_ADD_EXECUTABLE,
 #      CUDA_ADD_LIBRARY, CUDA_COMPILE, and CUDA_COMPILE_PTX all call this
 #      function under the hood.
 #
+#
+#
+# ::
+#
 #      Given the list of files (file0 file1 ... fileN) this macro generates
 #      custom commands that generate either PTX or linkable objects (use "PTX" or
 #      "OBJ" for the format argument to switch).  Files that don't end with .cu
 #      or have the HEADER_FILE_ONLY property are ignored.
 #
+#
+#
+# ::
+#
 #      The arguments passed in after OPTIONS are extra command line options to
 #      give to nvcc.  You can also specify per configuration options by
 #      specifying the name of the configuration followed by the options.  General
 #      options must preceed configuration specific options.  Not all
 #      configurations need to be specified, only the ones provided will be used.
 #
+#
+#
+# ::
+#
 #         OPTIONS -DFLAG=2 "-DFLAG_OTHER=space in flag"
 #         DEBUG -g
 #         RELEASE --use_fast_math
 #         RELWITHDEBINFO --use_fast_math;-g
 #         MINSIZEREL --use_fast_math
 #
+#
+#
+# ::
+#
 #      For certain configurations (namely VS generating object files with
 #      CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE set to ON), no generated file will
 #      be produced for the given cuda file.  This is because when you add the
 #      cuda file to Visual Studio it knows that this file produces an object file
 #      and will link in the resulting object file automatically.
 #
+#
+#
+# ::
+#
 #      This script will also generate a separate cmake script that is used at
 #      build time to invoke nvcc.  This is for several reasons.
 #
+#
+#
+# ::
+#
 #        1. nvcc can return negative numbers as return values which confuses
 #        Visual Studio into thinking that the command succeeded.  The script now
 #        checks the error codes and produces errors when there was a problem.
 #
+#
+#
+# ::
+#
 #        2. nvcc has been known to not delete incomplete results when it
 #        encounters problems.  This confuses build systems into thinking the
 #        target was generated when in fact an unusable file exists.  The script
 #        now deletes the output files if there was an error.
 #
+#
+#
+# ::
+#
 #        3. By putting all the options that affect the build into a file and then
 #        make the build rule dependent on the file, the output files will be
 #        regenerated when the options change.
 #
+#
+#
+# ::
+#
 #      This script also looks at optional arguments STATIC, SHARED, or MODULE to
 #      determine when to target the object compilation for a shared library.
 #      BUILD_SHARED_LIBS is ignored in CUDA_WRAP_SRCS, but it is respected in
@@ -242,17 +366,27 @@
 #      <target_name>_EXPORTS is defined when a shared library compilation is
 #      detected.
 #
+#
+#
+# ::
+#
 #      Flags passed into add_definitions with -D or /D are passed along to nvcc.
 #
 #
 #
-# The script defines the following variables::
+# The script defines the following variables:
+#
+# ::
 #
 #   CUDA_VERSION_MAJOR    -- The major version of cuda as reported by nvcc.
 #   CUDA_VERSION_MINOR    -- The minor version.
 #   CUDA_VERSION
 #   CUDA_VERSION_STRING   -- CUDA_VERSION_MAJOR.CUDA_VERSION_MINOR
 #
+#
+#
+# ::
+#
 #   CUDA_TOOLKIT_ROOT_DIR -- Path to the CUDA Toolkit (defined if not set).
 #   CUDA_SDK_ROOT_DIR     -- Path to the CUDA SDK.  Use this to find files in the
 #                            SDK.  This script will not directly support finding
@@ -278,13 +412,13 @@
 #                            Only available for CUDA version 3.2+.
 #   CUDA_cusparse_LIBRARY -- CUDA Sparse Matrix library.
 #                            Only available for CUDA version 3.2+.
-#   CUDA_npp_LIBRARY      -- NVIDIA Performance Primitives lib.
+#   CUDA_npp_LIBRARY      -- NVIDIA Performance Primitives library.
 #                            Only available for CUDA version 4.0+.
-#   CUDA_nppc_LIBRARY     -- NVIDIA Performance Primitives lib (core).
+#   CUDA_nppc_LIBRARY      -- NVIDIA Performance Primitives library (core).
 #                            Only available for CUDA version 5.5+.
-#   CUDA_nppi_LIBRARY     -- NVIDIA Performance Primitives lib (image processing).
+#   CUDA_nppi_LIBRARY      -- NVIDIA Performance Primitives library (image processing).
 #                            Only available for CUDA version 5.5+.
-#   CUDA_npps_LIBRARY     -- NVIDIA Performance Primitives lib (signal processing).
+#   CUDA_npps_LIBRARY      -- NVIDIA Performance Primitives library (signal processing).
 #                            Only available for CUDA version 5.5+.
 #   CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
 #                            Only available for CUDA version 3.2+.
@@ -293,15 +427,32 @@
 #                            Only available for CUDA version 3.2+.
 #                            Windows only.
 #
-
+#
+#
+#
+#
+# ::
+#
 #   James Bigler, NVIDIA Corp (nvidia.com - jbigler)
 #   Abe Stephens, SCI Institute -- http://www.sci.utah.edu/~abe/FindCuda.html
 #
+#
+#
+# ::
+#
 #   Copyright (c) 2008 - 2009 NVIDIA Corporation.  All rights reserved.
 #
+#
+#
+# ::
+#
 #   Copyright (c) 2007-2009
 #   Scientific Computing and Imaging Institute, University of Utah
 #
+#
+#
+# ::
+#
 #   This code is licensed under the MIT License.  See the FindCUDA.cmake script
 #   for the text of the license.

@@ -330,6 +481,11 @@

 # FindCUDA.cmake

+# We need to have at least this version to support the VERSION_LESS argument to 'if' (2.6.2) and unset (2.6.3)
+cmake_policy(PUSH)
+cmake_minimum_required(VERSION 2.6.3)
+cmake_policy(POP)
+
 # This macro helps us find the location of helper files we will need the full path to
 macro(CUDA_FIND_HELPER_FILE _name _extension)
  set(_full_name "${_name}.${_extension}")
@@ -452,17 +608,7 @@ set(CUDA_NVCC_FLAGS "" CACHE STRING "Semi-colon delimit multiple arguments.")
 if(CMAKE_GENERATOR MATCHES "Visual Studio")
  set(CUDA_HOST_COMPILER "$(VCInstallDir)bin" CACHE FILEPATH "Host side compiler used by NVCC")
 else()
-  # Using cc which is symlink to clang may let NVCC think it is GCC and issue
-  # unhandled -dumpspecs option to clang. Also in case neither
-  # CMAKE_C_COMPILER is defined (project does not use C language) nor
-  # CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let
-  # nvcc use its own default C compiler.
-  if(DEFINED CMAKE_C_COMPILER AND NOT DEFINED CUDA_HOST_COMPILER)
-    get_filename_component(c_compiler_realpath "${CMAKE_C_COMPILER}" REALPATH)
-  else()
-    set(c_compiler_realpath "")
-  endif()
-  set(CUDA_HOST_COMPILER "${c_compiler_realpath}" CACHE FILEPATH "Host side compiler used by NVCC")
+  set(CUDA_HOST_COMPILER "${CMAKE_C_COMPILER}" CACHE FILEPATH "Host side compiler used by NVCC")
 endif()

 # Propagate the host flags to the host compiler via -Xcompiler
@@ -529,16 +675,14 @@ endmacro()

 # Check to see if the CUDA_TOOLKIT_ROOT_DIR and CUDA_SDK_ROOT_DIR have changed,
 # if they have then clear the cache variables, so that will be detected again.
-if(DEFINED CUDA_TOOLKIT_ROOT_DIR_INTERNAL AND (NOT "${CUDA_TOOLKIT_ROOT_DIR}" STREQUAL "${CUDA_TOOLKIT_ROOT_DIR_INTERNAL}"))
-  unset(CUDA_TARGET_TRIPLET CACHE)
+if(NOT "${CUDA_TOOLKIT_ROOT_DIR}" STREQUAL "${CUDA_TOOLKIT_ROOT_DIR_INTERNAL}")
  unset(CUDA_TOOLKIT_TARGET_DIR CACHE)
  unset(CUDA_NVCC_EXECUTABLE CACHE)
  unset(CUDA_VERSION CACHE)
  cuda_unset_include_and_libraries()
 endif()

-if(DEFINED CUDA_TARGET_TRIPLET_INTERNAL AND (NOT "${CUDA_TARGET_TRIPLET}" STREQUAL "${CUDA_TARGET_TRIPLET_INTERNAL}") OR
-   (DEFINED CUDA_TOOLKIT_TARGET_DIR  AND DEFINED CUDA_TOOLKIT_TARGET_DIR_INTERNAL AND NOT "${CUDA_TOOLKIT_TARGET_DIR}" STREQUAL "${CUDA_TOOLKIT_TARGET_DIR_INTERNAL}"))
+if(NOT "${CUDA_TOOLKIT_TARGET_DIR}" STREQUAL "${CUDA_TOOLKIT_TARGET_DIR_INTERNAL}")
  cuda_unset_include_and_libraries()
 endif()

@@ -614,46 +758,27 @@ endif()
 # Always set this convenience variable
 set(CUDA_VERSION_STRING "${CUDA_VERSION}")

+# Support for arm cross compilation with CUDA 5.5
+set(__cuda_toolkit_target_dir_initial "${CUDA_TOOLKIT_ROOT_DIR}")
+if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+  if(ANDROID AND EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-androideabi")
+    set(__cuda_toolkit_target_dir_initial "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-androideabi")
+  elseif(EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf")
+    set(__cuda_toolkit_target_dir_initial "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf")
+  endif()
+endif()
+set(CUDA_TOOLKIT_TARGET_DIR "${__cuda_toolkit_target_dir_initial}" CACHE PATH "Toolkit target location.")
+mark_as_advanced(CUDA_TOOLKIT_TARGET_DIR)
+
 # Target CPU architecture
-if(DEFINED CUDA_TARGET_CPU_ARCH)
-  set(_cuda_target_cpu_arch_initial "${CUDA_TARGET_CPU_ARCH}")
-elseif(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM)")
+if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
  set(_cuda_target_cpu_arch_initial "ARM")
 else()
  set(_cuda_target_cpu_arch_initial "")
 endif()
-set(CUDA_TARGET_CPU_ARCH "${_cuda_target_cpu_arch_initial}" CACHE STRING "Specify the name of the class of CPU architecture for which the input files must be compiled.")
+set(CUDA_TARGET_CPU_ARCH ${_cuda_target_cpu_arch_initial} CACHE STRING "Specify the name of the class of CPU architecture for which the input files must be compiled.")
 mark_as_advanced(CUDA_TARGET_CPU_ARCH)

-# Target OS variant
-if(DEFINED CUDA_TARGET_OS_VARIANT)
-  set(_cuda_target_os_variant_initial "${CUDA_TARGET_OS_VARIANT}")
-else()
-  set(_cuda_target_os_variant_initial "")
-endif()
-set(CUDA_TARGET_OS_VARIANT "${_cuda_target_os_variant_initial}" CACHE STRING "Specify the name of the class of OS for which the input files must be compiled.")
-mark_as_advanced(CUDA_TARGET_OS_VARIANT)
-
-# Target triplet
-if(DEFINED CUDA_TARGET_TRIPLET)
-  set(_cuda_target_triplet_initial "${CUDA_TARGET_TRIPLET}")
-elseif(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND "${CUDA_TARGET_CPU_ARCH}" STREQUAL "ARM")
-  if("${CUDA_TARGET_OS_VARIANT}" STREQUAL "Android" AND EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-androideabi")
-    set(_cuda_target_triplet_initial "armv7-linux-androideabi")
-  elseif(EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf")
-    set(_cuda_target_triplet_initial "armv7-linux-gnueabihf")
-  endif()
-endif()
-set(CUDA_TARGET_TRIPLET "${_cuda_target_triplet_initial}" CACHE STRING "Specify the target triplet for which the input files must be compiled.")
-file(GLOB __cuda_available_target_tiplets RELATIVE "${CUDA_TOOLKIT_ROOT_DIR}/targets" "${CUDA_TOOLKIT_ROOT_DIR}/targets/*" )
-set_property(CACHE CUDA_TARGET_TRIPLET PROPERTY STRINGS ${__cuda_available_target_tiplets})
-mark_as_advanced(CUDA_TARGET_TRIPLET)
-
-# Target directory
-if(NOT DEFINED CUDA_TOOLKIT_TARGET_DIR AND CUDA_TARGET_TRIPLET AND EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/targets/${CUDA_TARGET_TRIPLET}")
-  set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT_DIR}/targets/${CUDA_TARGET_TRIPLET}")
-endif()
-
 # CUDA_TOOLKIT_INCLUDE
 find_path(CUDA_TOOLKIT_INCLUDE
  device_functions.h # Header included in toolkit
@@ -677,16 +802,10 @@ macro(cuda_find_library_local_first_with_path_ext _var _names _doc _path_ext )
    # and old paths.
    set(_cuda_64bit_lib_dir "${_path_ext}lib/x64" "${_path_ext}lib64" "${_path_ext}libx64" )
  endif()
-  if(CUDA_VERSION VERSION_GREATER "6.0")
-    set(_cuda_static_lib_names "")
-    foreach(name ${_names})
-      list(APPEND _cuda_static_lib_names "${name}_static")
-    endforeach()
-  endif()
  # CUDA 3.2+ on Windows moved the library directories, so we need to new
  # (lib/Win32) and the old path (lib).
  find_library(${_var}
-    NAMES ${_names} ${_cuda_static_lib_names}
+    NAMES ${_names}
    PATHS "${CUDA_TOOLKIT_TARGET_DIR}" "${CUDA_TOOLKIT_ROOT_DIR}"
    ENV CUDA_PATH
    ENV CUDA_LIB_PATH
@@ -696,7 +815,7 @@ macro(cuda_find_library_local_first_with_path_ext _var _names _doc _path_ext )
    )
  # Search default search paths, after we search our own set of paths.
  find_library(${_var}
-    NAMES ${_names} ${_cuda_static_lib_names}
+    NAMES ${_names}
    PATHS "/usr/lib/nvidia-current"
    DOC ${_doc}
    )
@@ -734,6 +853,18 @@ if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
 else()
  set(CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY})
 endif()
+if(APPLE)
+  # We need to add the path to cudart to the linker using rpath, since the
+  # library name for the cuda libraries is prepended with @rpath.
+  if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
+    get_filename_component(_cuda_path_to_cudart "${CUDA_CUDARTEMU_LIBRARY}" PATH)
+  else()
+    get_filename_component(_cuda_path_to_cudart "${CUDA_CUDART_LIBRARY}" PATH)
+  endif()
+  if(_cuda_path_to_cudart)
+    list(APPEND CUDA_LIBRARIES -Wl,-rpath "-Wl,${_cuda_path_to_cudart}")
+  endif()
+endif()

 # 1.1 toolkit on linux doesn't appear to have a separate library on
 # some platforms.
@@ -866,8 +997,6 @@ set(CUDA_FOUND TRUE)

 set(CUDA_TOOLKIT_ROOT_DIR_INTERNAL "${CUDA_TOOLKIT_ROOT_DIR}" CACHE INTERNAL
  "This is the value of the last time CUDA_TOOLKIT_ROOT_DIR was set successfully." FORCE)
-set(CUDA_TARGET_TRIPLET_INTERNAL "${CUDA_TARGET_TRIPLET}" CACHE INTERNAL
-  "This is the value of the last time CUDA_TARGET_TRIPLET was set successfully." FORCE)
 set(CUDA_TOOLKIT_TARGET_DIR_INTERNAL "${CUDA_TOOLKIT_TARGET_DIR}" CACHE INTERNAL
  "This is the value of the last time CUDA_TOOLKIT_TARGET_DIR was set successfully." FORCE)
 set(CUDA_SDK_ROOT_DIR_INTERNAL "${CUDA_SDK_ROOT_DIR}" CACHE INTERNAL
@@ -915,15 +1044,15 @@ macro(CUDA_GET_SOURCES_AND_OPTIONS _sources _cmake_options _options)
  set( ${_options} )
  set( _found_options FALSE )
  foreach(arg ${ARGN})
-    if("x${arg}" STREQUAL "xOPTIONS")
+    if(arg STREQUAL "OPTIONS")
      set( _found_options TRUE )
    elseif(
-        "x${arg}" STREQUAL "xWIN32" OR
-        "x${arg}" STREQUAL "xMACOSX_BUNDLE" OR
-        "x${arg}" STREQUAL "xEXCLUDE_FROM_ALL" OR
-        "x${arg}" STREQUAL "xSTATIC" OR
-        "x${arg}" STREQUAL "xSHARED" OR
-        "x${arg}" STREQUAL "xMODULE"
+        arg STREQUAL "WIN32" OR
+        arg STREQUAL "MACOSX_BUNDLE" OR
+        arg STREQUAL "EXCLUDE_FROM_ALL" OR
+        arg STREQUAL "STATIC" OR
+        arg STREQUAL "SHARED" OR
+        arg STREQUAL "MODULE"
        )
      list(APPEND ${_cmake_options} ${arg})
    else()
@@ -1019,7 +1148,7 @@ function(CUDA_COMPUTE_BUILD_PATH path build_path)
    endif()
  endif()

-  # This recipe is from cmLocalGenerator::CreateSafeUniqueObjectFileName in the
+  # This recipie is from cmLocalGenerator::CreateSafeUniqueObjectFileName in the
  # CMake source.

  # Remove leading /
@@ -1048,7 +1177,7 @@ endfunction()
 # a .cpp or .ptx file.
 # INPUT:
 #   cuda_target         - Target name
-#   format              - PTX, CUBIN, FATBIN or OBJ
+#   format              - PTX or OBJ
 #   FILE1 .. FILEN      - The remaining arguments are the sources to be wrapped.
 #   OPTIONS             - Extra options to NVCC
 # OUTPUT:
@@ -1098,10 +1227,6 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
    set(nvcc_flags ${nvcc_flags} "--target-cpu-architecture=${CUDA_TARGET_CPU_ARCH}")
  endif()

-  if(CUDA_TARGET_OS_VARIANT AND CUDA_VERSION VERSION_LESS "7.0")
-    set(nvcc_flags ${nvcc_flags} "-target-os-variant=${CUDA_TARGET_OS_VARIANT}")
-  endif()
-
  # This needs to be passed in at this stage, because VS needs to fill out the
  # value of VCInstallDir from within VS.  Note that CCBIN is only used if
  # -ccbin or --compiler-bindir isn't used and CUDA_HOST_COMPILER matches
@@ -1230,7 +1355,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
  foreach(file ${ARGN})
    # Ignore any file marked as a HEADER_FILE_ONLY
    get_source_file_property(_is_header ${file} HEADER_FILE_ONLY)
-    if(${file} MATCHES "\\.cu$" AND NOT _is_header)
+    if(${file} MATCHES ".*\\.cu$" AND NOT _is_header)

      # Allow per source file overrides of the format.
      get_source_file_property(_cuda_source_format ${file} CUDA_SOURCE_PROPERTY_FORMAT)
@@ -1238,22 +1363,16 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
        set(_cuda_source_format ${format})
      endif()

-      if( ${_cuda_source_format} MATCHES "OBJ")
-        set( cuda_compile_to_external_module OFF )
+      if( ${_cuda_source_format} MATCHES "PTX" )
+        set( compile_to_ptx ON )
+      elseif( ${_cuda_source_format} MATCHES "OBJ")
+        set( compile_to_ptx OFF )
      else()
-        set( cuda_compile_to_external_module ON )
-        if( ${_cuda_source_format} MATCHES "PTX" )
-          set( cuda_compile_to_external_module_type "ptx" )
-        elseif( ${_cuda_source_format} MATCHES "CUBIN")
-          set( cuda_compile_to_external_module_type "cubin" )
-        elseif( ${_cuda_source_format} MATCHES "FATBIN")
-          set( cuda_compile_to_external_module_type "fatbin" )
-        else()
-          message( FATAL_ERROR "Invalid format flag passed to CUDA_WRAP_SRCS for file '${file}': '${_cuda_source_format}'.  Use OBJ, PTX, CUBIN or FATBIN.")
-        endif()
+        message( FATAL_ERROR "Invalid format flag passed to CUDA_WRAP_SRCS for file '${file}': '${_cuda_source_format}'.  Use OBJ or PTX.")
      endif()

-      if(cuda_compile_to_external_module)
+
+      if(compile_to_ptx)
        # Don't use any of the host compilation flags for PTX targets.
        set(CUDA_HOST_FLAGS)
        set(CUDA_NVCC_FLAGS_CONFIG)
@@ -1268,7 +1387,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
      if(CUDA_GENERATED_OUTPUT_DIR)
        set(cuda_compile_output_dir "${CUDA_GENERATED_OUTPUT_DIR}")
      else()
-        if ( cuda_compile_to_external_module )
+        if ( compile_to_ptx )
          set(cuda_compile_output_dir "${CMAKE_CURRENT_BINARY_DIR}")
        else()
          set(cuda_compile_output_dir "${cuda_compile_intermediate_directory}")
@@ -1278,10 +1397,10 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
      # Add a custom target to generate a c or ptx file. ######################

      get_filename_component( basename ${file} NAME )
-      if( cuda_compile_to_external_module )
+      if( compile_to_ptx )
        set(generated_file_path "${cuda_compile_output_dir}")
-        set(generated_file_basename "${cuda_target}_generated_${basename}.${cuda_compile_to_external_module_type}")
-        set(format_flag "-${cuda_compile_to_external_module_type}")
+        set(generated_file_basename "${cuda_target}_generated_${basename}.ptx")
+        set(format_flag "-ptx")
        file(MAKE_DIRECTORY "${cuda_compile_output_dir}")
      else()
        set(generated_file_path "${cuda_compile_output_dir}/${CMAKE_CFG_INTDIR}")
@@ -1304,7 +1423,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
      set(custom_target_script "${cuda_compile_intermediate_directory}/${generated_file_basename}.cmake")

      # Setup properties for obj files:
-      if( NOT cuda_compile_to_external_module )
+      if( NOT compile_to_ptx )
        set_source_files_properties("${generated_file}"
          PROPERTIES
          EXTERNAL_OBJECT true # This is an object file not to be compiled, but only be linked.
@@ -1319,7 +1438,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
        set(source_file "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
      endif()

-      if( NOT cuda_compile_to_external_module AND CUDA_SEPARABLE_COMPILATION)
+      if( NOT compile_to_ptx AND CUDA_SEPARABLE_COMPILATION)
        list(APPEND ${cuda_target}_SEPARABLE_COMPILATION_OBJECTS "${generated_file}")
      endif()

@@ -1336,7 +1455,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
      # Build the NVCC made dependency file ###################################
      set(build_cubin OFF)
      if ( NOT CUDA_BUILD_EMULATION AND CUDA_BUILD_CUBIN )
-         if ( NOT cuda_compile_to_external_module )
+         if ( NOT compile_to_ptx )
           set ( build_cubin ON )
         endif()
      endif()
@@ -1363,8 +1482,8 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)

      # Create up the comment string
      file(RELATIVE_PATH generated_file_relative_path "${CMAKE_BINARY_DIR}" "${generated_file}")
-      if(cuda_compile_to_external_module)
-        set(cuda_build_comment_string "Building NVCC ${cuda_compile_to_external_module_type} file ${generated_file_relative_path}")
+      if(compile_to_ptx)
+        set(cuda_build_comment_string "Building NVCC ptx file ${generated_file_relative_path}")
      else()
        set(cuda_build_comment_string "Building NVCC (${cuda_build_type}) object ${generated_file_relative_path}")
      endif()
@@ -1457,27 +1576,18 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
    # If -ccbin, --compiler-bindir has been specified, don't do anything.  Otherwise add it here.
    list( FIND nvcc_flags "-ccbin" ccbin_found0 )
    list( FIND nvcc_flags "--compiler-bindir" ccbin_found1 )
-    if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
+    if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 )
      list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"")
    endif()
-    # Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG}
-    set(config_specific_flags)
    set(flags)
    foreach(config ${CUDA_configuration_types})
      string(TOUPPER ${config} config_upper)
-      # Add config specific flags
-      foreach(f ${CUDA_NVCC_FLAGS_${config_upper}})
-        list(APPEND config_specific_flags $<$<CONFIG:${config}>:${f}>)
-      endforeach()
      set(important_host_flags)
      _cuda_get_important_host_flags(important_host_flags ${CMAKE_${CUDA_C_OR_CXX}_FLAGS_${config_upper}})
      foreach(f ${important_host_flags})
        list(APPEND flags $<$<CONFIG:${config}>:-Xcompiler> $<$<CONFIG:${config}>:${f}>)
      endforeach()
    endforeach()
-    # Add our general CUDA_NVCC_FLAGS with the configuration specifig flags
-    set(nvcc_flags ${CUDA_NVCC_FLAGS} ${config_specific_flags} ${nvcc_flags})
-
    file(RELATIVE_PATH output_file_relative_path "${CMAKE_BINARY_DIR}" "${output_file}")

    # Some generators don't handle the multiple levels of custom command
@@ -1603,29 +1713,21 @@ endmacro()

 ###############################################################################
 ###############################################################################
-# (Internal) helper for manually added cuda source files with specific targets
+# CUDA COMPILE
 ###############################################################################
 ###############################################################################
-macro(cuda_compile_base cuda_target format generated_files)
+macro(CUDA_COMPILE generated_files)

  # Separate the sources from the options
  CUDA_GET_SOURCES_AND_OPTIONS(_sources _cmake_options _options ${ARGN})
  # Create custom commands and targets for each file.
-  CUDA_WRAP_SRCS( ${cuda_target} ${format} _generated_files ${_sources} ${_cmake_options}
+  CUDA_WRAP_SRCS( cuda_compile OBJ _generated_files ${_sources} ${_cmake_options}
    OPTIONS ${_options} )

  set( ${generated_files} ${_generated_files})

 endmacro()

-###############################################################################
-###############################################################################
-# CUDA COMPILE
-###############################################################################
-###############################################################################
-macro(CUDA_COMPILE generated_files)
-  cuda_compile_base(cuda_compile OBJ ${generated_files} ${ARGN})
-endmacro()

 ###############################################################################
 ###############################################################################
@@ -1633,27 +1735,16 @@ endmacro()
 ###############################################################################
 ###############################################################################
 macro(CUDA_COMPILE_PTX generated_files)
-  cuda_compile_base(cuda_compile_ptx PTX ${generated_files} ${ARGN})
-endmacro()

-###############################################################################
-###############################################################################
-# CUDA COMPILE FATBIN
-###############################################################################
-###############################################################################
-macro(CUDA_COMPILE_FATBIN generated_files)
-  cuda_compile_base(cuda_compile_fatbin FATBIN ${generated_files} ${ARGN})
-endmacro()
+  # Separate the sources from the options
+  CUDA_GET_SOURCES_AND_OPTIONS(_sources _cmake_options _options ${ARGN})
+  # Create custom commands and targets for each file.
+  CUDA_WRAP_SRCS( cuda_compile_ptx PTX _generated_files ${_sources} ${_cmake_options}
+    OPTIONS ${_options} )

-###############################################################################
-###############################################################################
-# CUDA COMPILE CUBIN
-###############################################################################
-###############################################################################
-macro(CUDA_COMPILE_CUBIN generated_files)
-  cuda_compile_base(cuda_compile_cubin CUBIN ${generated_files} ${ARGN})
-endmacro()
+  set( ${generated_files} ${_generated_files})

+endmacro()

 ###############################################################################
 ###############################################################################
@@ -37,11 +37,12 @@

 file(READ ${input_file} depend_text)

-if (NOT "${depend_text}" STREQUAL "")
+if (${depend_text} MATCHES ".+")

  # message("FOUND DEPENDS")

-  string(REPLACE "\\ " " " depend_text ${depend_text})
+  # Remember, four backslashes is escaped to one backslash in the string.
+  string(REGEX REPLACE "\\\\ " " " depend_text ${depend_text})

  # This works for the nvcc -M generated dependency files.
  string(REGEX REPLACE "^.* : " "" depend_text ${depend_text})
@@ -37,10 +37,11 @@

 file(READ ${input_file} file_text)

-if (NOT "${file_text}" STREQUAL "")
+if (${file_text} MATCHES ".+")

-  string(REPLACE ";" "\\;" file_text ${file_text})
-  string(REPLACE "\ncode" ";code" file_text ${file_text})
+  # Remember, four backslashes is escaped to one backslash in the string.
+  string(REGEX REPLACE ";" "\\\\;" file_text ${file_text})
+  string(REGEX REPLACE "\ncode" ";code" file_text ${file_text})

  list(LENGTH file_text len)

@@ -56,7 +57,7 @@ if (NOT "${file_text}" STREQUAL "")

        # Extract kernel names.
        if (${entry} MATCHES "[^g]name = ([^ ]+)")
-          set(entry "${CMAKE_MATCH_1}")
+          string(REGEX REPLACE ".* = ([^ ]+)" "\\1" entry ${entry})

          # Check to see if the kernel name starts with "_"
          set(skip FALSE)
@@ -75,19 +76,19 @@ if (NOT "${file_text}" STREQUAL "")

          # Registers
          if (${entry} MATCHES "reg([ ]+)=([ ]+)([^ ]+)")
-            set(entry "${CMAKE_MATCH_3}")
+            string(REGEX REPLACE ".*([ ]+)=([ ]+)([^ ]+)" "\\3" entry ${entry})
            message("Registers: ${entry}")
          endif()

          # Local memory
          if (${entry} MATCHES "lmem([ ]+)=([ ]+)([^ ]+)")
-            set(entry "${CMAKE_MATCH_3}")
+            string(REGEX REPLACE ".*([ ]+)=([ ]+)([^ ]+)" "\\3" entry ${entry})
            message("Local:     ${entry}")
          endif()

          # Shared memory
          if (${entry} MATCHES "smem([ ]+)=([ ]+)([^ ]+)")
-            set(entry "${CMAKE_MATCH_3}")
+            string(REGEX REPLACE ".*([ ]+)=([ ]+)([^ ]+)" "\\3" entry ${entry})
            message("Shared:    ${entry}")
          endif()

@@ -62,7 +62,7 @@ set(cmake_dependency_file "@cmake_dependency_file@") # path
 set(CUDA_make2cmake "@CUDA_make2cmake@") # path
 set(CUDA_parse_cubin "@CUDA_parse_cubin@") # path
 set(build_cubin @build_cubin@) # bool
-set(CUDA_HOST_COMPILER "@CUDA_HOST_COMPILER@") # path
+set(CUDA_HOST_COMPILER "@CUDA_HOST_COMPILER@") # bool
 # We won't actually use these variables for now, but we need to set this, in
 # order to force this file to be run again if it changes.
 set(generated_file_path "@generated_file_path@") # path
@@ -106,7 +106,7 @@ list(APPEND CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS_${build_configuration}})
 # Any -ccbin existing in CUDA_NVCC_FLAGS gets highest priority
 list( FIND CUDA_NVCC_FLAGS "-ccbin" ccbin_found0 )
 list( FIND CUDA_NVCC_FLAGS "--compiler-bindir" ccbin_found1 )
-if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
+if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 )
  if (CUDA_HOST_COMPILER STREQUAL "$(VCInstallDir)bin" AND DEFINED CCBIN)
    set(CCBIN -ccbin "${CCBIN}")
  else()
@@ -126,7 +126,7 @@ endif()
 # and other return variables are present after executing the process.
 macro(cuda_execute_process status command)
  set(_command ${command})
-  if(NOT "x${_command}" STREQUAL "xCOMMAND")
+  if(NOT _command STREQUAL "COMMAND")
    message(FATAL_ERROR "Malformed call to cuda_execute_process.  Missing COMMAND as second argument. (command = ${command})")
  endif()
  if(verbose)
@@ -6,62 +6,34 @@ endif()

 set(HAVE_WINRT FALSE)

-# search Windows (Phone) Platform SDK
-message(STATUS "Checking for Windows (Phone) Platform SDK 8.0/8.1")
-unset(WINDOWS_SDK_PATH CACHE)
-GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhoneApp\\v8.1;InstallationFolder]" ABSOLUTE CACHE)
-if((NOT ENABLE_WINPHONESDK81) OR (NOT (MSVC_VERSION EQUAL 1800)) OR (WINDOWS_SDK_PATH STREQUAL ""))
-  unset(WINDOWS_SDK_PATH CACHE)
-  GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]" ABSOLUTE CACHE)
-  if((NOT ENABLE_WINPHONESDK80) OR (MSVC_VERSION LESS 1700) OR (WINDOWS_SDK_PATH STREQUAL ""))
-    unset(WINDOWS_SDK_PATH CACHE)
-    GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]" ABSOLUTE CACHE)
-    if((NOT ENABLE_WINSDK81) OR (NOT (MSVC_VERSION EQUAL 1800)) OR (WINDOWS_SDK_PATH STREQUAL ""))
-      set(HAVE_MSPDK FALSE)
-      unset(WINDOWS_SDK_PATH CACHE)
-      GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]" ABSOLUTE CACHE)
-      if(WINDOWS_SDK_PATH STREQUAL "")
-        set(HAVE_MSPDK FALSE)
-        message(STATUS "Windows (Phone) Platform SDK 8.0/8.1 was not found")
-      else()
-        set(HAVE_MSPDK TRUE)
-      endif()
-    else()
-      set(HAVE_MSPDK TRUE)
-    endif()
-  else()
-    set(HAVE_MSPDK TRUE)
-  endif()
+# search Windows Platform SDK
+message(STATUS "Checking for Windows Platform SDK")
+GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]" ABSOLUTE CACHE)
+if(WINDOWS_SDK_PATH STREQUAL "")
+  set(HAVE_MSPDK FALSE)
+  message(STATUS "Windows Platform SDK 8.0 was not found")
 else()
  set(HAVE_MSPDK TRUE)
 endif()

-#search for Visual Studio 11.0/12.0 install directory
-message(STATUS "Checking for Visual Studio 2012/2013")
-unset(VISUAL_STUDIO_PATH CACHE)
-GET_FILENAME_COMPONENT(VISUAL_STUDIO_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VS;ProductDir] REALPATH CACHE)
-if((NOT ENABLE_LIBVS2013) OR (NOT (MSVC_VERSION EQUAL 1800)) OR (VISUAL_STUDIO_PATH STREQUAL ""))
-  set(HAVE_MSVC2013 FALSE)
-  unset(VISUAL_STUDIO_PATH CACHE)
-  GET_FILENAME_COMPONENT(VISUAL_STUDIO_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir] REALPATH CACHE)
-  if(VISUAL_STUDIO_PATH STREQUAL "")
-    set(HAVE_MSVC2012 FALSE)
-    message(STATUS "Visual Studio 2012/2013 not found")
-  else()
-    set(HAVE_MSVC2012 TRUE)
-  endif()
+#search for Visual Studio 11.0 install directory
+message(STATUS "Checking for Visual Studio 2012")
+GET_FILENAME_COMPONENT(VISUAL_STUDIO_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir] REALPATH CACHE)
+if(VISUAL_STUDIO_PATH STREQUAL "")
+  set(HAVE_MSVC2012 FALSE)
+  message(STATUS "Visual Studio 2012 was not found")
 else()
-  set(HAVE_MSVC2013 TRUE)
+  set(HAVE_MSVC2012 TRUE)
 endif()

 try_compile(HAVE_WINRT_SDK
  "${OpenCV_BINARY_DIR}"
  "${OpenCV_SOURCE_DIR}/cmake/checks/winrttest.cpp")

-if(ENABLE_WINRT_MODE AND HAVE_WINRT_SDK AND (HAVE_MSVC2012 OR HAVE_MSVC2013) AND HAVE_MSPDK)
+if(ENABLE_WINRT_MODE AND HAVE_WINRT_SDK AND HAVE_MSVC2012 AND HAVE_MSPDK)
  set(HAVE_WINRT TRUE)
  set(HAVE_WINRT_CX TRUE)
-elseif(ENABLE_WINRT_MODE_NATIVE AND HAVE_WINRT_SDK AND (HAVE_MSVC2012 OR HAVE_MSVC2013) AND HAVE_MSPDK)
+elseif(ENABLE_WINRT_MODE_NATIVE AND HAVE_WINRT_SDK AND HAVE_MSVC2012 AND HAVE_MSPDK)
  set(HAVE_WINRT TRUE)
  set(HAVE_WINRT_CX FALSE)
 endif()
@@ -112,10 +112,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    add_extra_compiler_option(-march=i686)
  endif()

-  if(APPLE)
-    add_extra_compiler_option(-Wno-semicolon-before-method-body)
-  endif()
-
  # Other optimizations
  if(ENABLE_OMIT_FRAME_POINTER)
    add_extra_compiler_option(-fomit-frame-pointer)
@@ -144,11 +140,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
  # SSE3 and further should be disabled under MingW because it generates compiler errors
  if(NOT MINGW)
    if(ENABLE_AVX)
-      add_extra_compiler_option("-mavx")
-    endif()
-
-    if(ENABLE_AVX2)
-      add_extra_compiler_option("-mavx2")
+      add_extra_compiler_option(-mavx)
    endif()

    # GCC depresses SSEx instructions when -mavx is used. Instead, it generates new AVX instructions or AVX equivalence for all SSEx instructions when needed.
@@ -195,11 +187,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    add_extra_compiler_option(-ffunction-sections)
  endif()

-  if(ENABLE_COVERAGE)
-    set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} --coverage")
-    set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} --coverage")
-  endif()
-
  set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} -DNDEBUG")
  set(OPENCV_EXTRA_FLAGS_DEBUG "${OPENCV_EXTRA_FLAGS_DEBUG} -O0 -DDEBUG -D_DEBUG")
 endif()
@@ -224,6 +211,10 @@ if(MSVC)
    set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
  endif()

+  if(ENABLE_AVX AND NOT MSVC_VERSION LESS 1600)
+    set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /arch:AVX")
+  endif()
+
  if(ENABLE_SSE4_1 AND CV_ICC AND NOT OPENCV_EXTRA_FLAGS MATCHES "/arch:")
    set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /arch:SSE4.1")
  endif()
@@ -242,7 +233,7 @@ if(MSVC)
    endif()
  endif()

-  if(ENABLE_SSE OR ENABLE_SSE2 OR ENABLE_SSE3 OR ENABLE_SSE4_1 OR ENABLE_AVX OR ENABLE_AVX2)
+  if(ENABLE_SSE OR ENABLE_SSE2 OR ENABLE_SSE3 OR ENABLE_SSE4_1 OR ENABLE_AVX)
    set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /Oi")
  endif()

@@ -258,7 +249,7 @@ if(MSVC)
 endif()

 # Extra link libs if the user selects building static libs:
-if(NOT BUILD_SHARED_LIBS AND ((CMAKE_COMPILER_IS_GNUCXX AND NOT ANDROID) OR QNX))
+if(NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX AND NOT ANDROID)
  # Android does not need these settings because they are already set by toolchain file
  set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
  set(OPENCV_EXTRA_FLAGS "-fPIC ${OPENCV_EXTRA_FLAGS}")
@@ -326,12 +326,12 @@ macro(add_android_project target path)

      # copy all needed CUDA libs to project if EMBED_CUDA flag is present
      if(android_proj_EMBED_CUDA)
-        set(android_proj_culibs ${CUDA_npp_LIBRARY_ABS} ${CUDA_LIBRARIES_ABS})
+        set(android_proj_culibs ${CUDA_npp_LIBRARY} ${CUDA_LIBRARIES})
        if(HAVE_CUFFT)
-          list(INSERT android_proj_culibs 0 ${CUDA_cufft_LIBRARY_ABS})
+          list(INSERT android_proj_culibs 0 ${CUDA_cufft_LIBRARY})
        endif()
        if(HAVE_CUBLAS)
-          list(INSERT android_proj_culibs 0 ${CUDA_cublas_LIBRARY_ABS})
+          list(INSERT android_proj_culibs 0 ${CUDA_cublas_LIBRARY})
        endif()
        foreach(lib ${android_proj_culibs})
          get_filename_component(f "${lib}" NAME)
@@ -15,10 +15,19 @@ endif()

 set(CMAKE_MODULE_PATH "${OpenCV_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

-if(ANDROID AND "${CUDA_VERSION}" VERSION_LESS "7.0")
-  set(CUDA_TARGET_OS_VARIANT "Android")
-endif()
-find_host_package(CUDA 4.2 QUIET)
+foreach(var INCLUDE LIBRARY PROGRAM)
+  set(__old_frpm_${var} "${CMAKE_FIND_ROOT_PATH_MODE_${var}}")
+endforeach()
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+
+find_package(CUDA 4.2 QUIET)
+
+foreach(var INCLUDE LIBRARY PROGRAM)
+  set(CMAKE_FIND_ROOT_PATH_MODE_${var} "${__old_frpm_${var}}")
+endforeach()

 list(REMOVE_AT CMAKE_MODULE_PATH 0)

@@ -82,13 +91,8 @@ if(CUDA_FOUND)

  if(NOT DEFINED __cuda_arch_bin)
    if(ANDROID)
-      if (ARM)
-        set(__cuda_arch_bin "3.2")
-        set(__cuda_arch_ptx "")
-      elseif(AARCH64)
-        set(__cuda_arch_bin "5.2")
-        set(__cuda_arch_ptx "")
-      endif()
+      set(__cuda_arch_bin "3.2")
+      set(__cuda_arch_ptx "")
    else()
      if(${CUDA_VERSION} VERSION_LESS "5.0")
        set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0")
@@ -150,6 +154,7 @@ if(CUDA_FOUND)

  if(ANDROID)
    set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xptxas;-dlcm=ca")
+    set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-target-os-variant=Android")
  endif()

  message(STATUS "CUDA NVCC target flags: ${CUDA_NVCC_FLAGS}")
@@ -175,9 +180,6 @@ if(CUDA_FOUND)
      # we remove -Wsign-promo as it generates warnings under linux
      string(REPLACE "-Wsign-promo" "" ${var} "${${var}}")

-      # we remove -Wno-sign-promo as it generates warnings under linux
-      string(REPLACE "-Wno-sign-promo" "" ${var} "${${var}}")
-
      # we remove -Wno-delete-non-virtual-dtor because it's used for C++ compiler
      # but NVCC uses C compiler by default
      string(REPLACE "-Wno-delete-non-virtual-dtor" "" ${var} "${${var}}")
@@ -214,42 +216,3 @@ else()
  unset(CUDA_ARCH_BIN CACHE)
  unset(CUDA_ARCH_PTX CACHE)
 endif()
-
-if(HAVE_CUDA)
-  set(CUDA_LIBS_PATH "")
-  foreach(p ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
-    get_filename_component(_tmp ${p} PATH)
-    list(APPEND CUDA_LIBS_PATH ${_tmp})
-  endforeach()
-
-  if(HAVE_CUBLAS)
-    foreach(p ${CUDA_cublas_LIBRARY})
-      get_filename_component(_tmp ${p} PATH)
-      list(APPEND CUDA_LIBS_PATH ${_tmp})
-    endforeach()
-  endif()
-
-  if(HAVE_CUFFT)
-    foreach(p ${CUDA_cufft_LIBRARY})
-      get_filename_component(_tmp ${p} PATH)
-      list(APPEND CUDA_LIBS_PATH ${_tmp})
-    endforeach()
-  endif()
-
-  list(REMOVE_DUPLICATES CUDA_LIBS_PATH)
-  link_directories(${CUDA_LIBS_PATH})
-
-  set(CUDA_LIBRARIES_ABS ${CUDA_LIBRARIES})
-  ocv_convert_to_lib_name(CUDA_LIBRARIES ${CUDA_LIBRARIES})
-  set(CUDA_npp_LIBRARY_ABS ${CUDA_npp_LIBRARY})
-  ocv_convert_to_lib_name(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY})
-  if(HAVE_CUBLAS)
-    set(CUDA_cublas_LIBRARY_ABS ${CUDA_cublas_LIBRARY})
-    ocv_convert_to_lib_name(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY})
-  endif()
-
-  if(HAVE_CUFFT)
-    set(CUDA_cufft_LIBRARY_ABS ${CUDA_cufft_LIBRARY})
-    ocv_convert_to_lib_name(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY})
-  endif()
-endif()
@@ -109,8 +109,6 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
  set(X86 1)
 elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*|ARM.*")
  set(ARM 1)
-elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64.*|AARCH64.*")
-  set(AARCH64 1)
 endif()


@@ -38,9 +38,7 @@ if(PYTHON_EXECUTABLE)

  if(NOT ANDROID AND NOT IOS)
    ocv_check_environment_variables(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
-    if(CMAKE_CROSSCOMPILING)
-      find_host_package(PythonLibs ${PYTHON_VERSION_MAJOR_MINOR})
-    elseif(CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL)
+    if(CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL)
      find_host_package(PythonLibs ${PYTHON_VERSION_FULL} EXACT)
    else()
      find_host_package(PythonLibs ${PYTHON_VERSION_FULL})
@@ -83,39 +81,24 @@ if(PYTHON_EXECUTABLE)
    SET(PYTHON_PACKAGES_PATH "${_PYTHON_PACKAGES_PATH}" CACHE PATH "Where to install the python packages.")

    if(NOT PYTHON_NUMPY_INCLUDE_DIR)
-      if(CMAKE_CROSSCOMPILING)
-        message(STATUS "Cannot probe for Python/Numpy support (because we are cross-compiling OpenCV)")
-        message(STATUS "If you want to enable Python/Numpy support, set the following variables:")
-        message(STATUS "  PYTHON_INCLUDE_PATH")
-        message(STATUS "  PYTHON_LIBRARIES")
-        message(STATUS "  PYTHON_NUMPY_INCLUDE_DIR")
-      else()
-        # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
-        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
-                        RESULT_VARIABLE PYTHON_NUMPY_PROCESS
-                        OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+      # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
+      execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
+                      RESULT_VARIABLE PYTHON_NUMPY_PROCESS
+                      OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)

-        if(NOT PYTHON_NUMPY_PROCESS EQUAL 0)
-          unset(PYTHON_NUMPY_INCLUDE_DIR)
-        endif()
+      if(PYTHON_NUMPY_PROCESS EQUAL 0)
+        file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR)
+        set(PYTHON_NUMPY_INCLUDE_DIR ${_PYTHON_NUMPY_INCLUDE_DIR} CACHE PATH "Path to numpy headers")
      endif()
    endif()

    if(PYTHON_NUMPY_INCLUDE_DIR)
-      file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR)
-      set(PYTHON_NUMPY_INCLUDE_DIR ${_PYTHON_NUMPY_INCLUDE_DIR} CACHE PATH "Path to numpy headers")
      set(PYTHON_USE_NUMPY TRUE)
-      if(CMAKE_CROSSCOMPILING)
-        if(NOT PYTHON_NUMPY_VERSION)
-          set(PYTHON_NUMPY_VERSION "undefined - cannot be probed because of the cross-compilation")
-        endif()
-      else()
-        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.version.version"
+      execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.version.version"
                        RESULT_VARIABLE PYTHON_NUMPY_PROCESS
                        OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
                        OUTPUT_STRIP_TRAILING_WHITESPACE)
-      endif()
    endif()
  endif(NOT ANDROID AND NOT IOS)

@@ -1,53 +0,0 @@
-if(NOT WITH_VTK OR ANDROID OR IOS)
-  return()
-endif()
-
-# VTK 6.x components
-find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
-
-# VTK 5.x components
-if(NOT VTK_FOUND)
-  find_package(VTK QUIET COMPONENTS vtkCommon NO_MODULE)
-endif()
-
-if(NOT VTK_FOUND)
-  set(HAVE_VTK OFF)
-  message(STATUS "VTK is not found. Please set -DVTK_DIR in CMake to VTK build directory, or to VTK install subdirectory with VTKConfig.cmake file")
-  return()
-endif()
-
-# Don't support ealier VTKs
-if(${VTK_VERSION} VERSION_LESS "5.8.0")
-  message(STATUS "VTK support is disabled. VTK ver. 5.8.0 is minimum required, but found VTK ver. ${VTK_VERSION}")
-  return()
-endif()
-
-# Different Qt versions can't be linked together
-if(HAVE_QT5 AND ${VTK_VERSION} VERSION_LESS "6.0.0")
-  if(VTK_USE_QT)
-    message(STATUS "VTK support is disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.${VTK_VERSION} + Qt4")
-  endif()
-endif()
-
-# Different Qt versions can't be linked together. VTK 6.0.0 doesn't provide a way to get Qt version it was linked with
-if(HAVE_QT5 AND ${VTK_VERSION} VERSION_EQUAL "6.0.0" AND NOT DEFINED FORCE_VTK)
-  message(STATUS "VTK support is disabled. Possible incompatible combination: OpenCV+Qt5, and VTK ver.${VTK_VERSION} with Qt4")
-  message(STATUS "If it is known that VTK was compiled without Qt4, please define '-DFORCE_VTK=TRUE' flag in CMake")
-  return()
-endif()
-
-# Different Qt versions can't be linked together
-if(HAVE_QT AND ${VTK_VERSION} VERSION_GREATER "6.0.0" AND NOT ${VTK_QT_VERSION} STREQUAL "")
-  if(HAVE_QT5 AND ${VTK_QT_VERSION} EQUAL "4")
-    message(STATUS "VTK support is disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.${VTK_VERSION} + Qt4")
-    return()
-  endif()
-
-  if(NOT HAVE_QT5 AND ${VTK_QT_VERSION} EQUAL "5")
-    message(STATUS "VTK support is disabled. Incompatible combination: OpenCV + Qt4 and VTK ver.${VTK_VERSION} + Qt5")
-    return()
-  endif()
-endif()
-
-set(HAVE_VTK ON)
-message(STATUS "Found VTK ver. ${VTK_VERSION} (usefile: ${VTK_USE_FILE})")
@@ -4,7 +4,7 @@
 CONFIGURE_FILE(
  "${OpenCV_SOURCE_DIR}/cmake/templates/cmake_uninstall.cmake.in"
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  @ONLY)
+  IMMEDIATE @ONLY)

 ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 if(ENABLE_SOLUTION_FOLDERS)
@@ -163,16 +163,9 @@ function(set_ipp_new_libraries _LATEST_VERSION)
        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCV}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPI}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPS}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
-        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCORE}${IPP_SUFFIX}${IPP_LIB_SUFFIX})
+        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCORE}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
+        PARENT_SCOPE)

-    if (UNIX)
-        set(IPP_LIBRARIES
-            ${IPP_LIBRARIES}
-            ${IPP_LIB_PREFIX}irc${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${IPP_LIB_PREFIX}imf${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${IPP_LIB_PREFIX}svml${CMAKE_SHARED_LIBRARY_SUFFIX})
-    endif()
-    set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
    return()

 endfunction()
@@ -215,39 +208,19 @@ function(set_ipp_variables _LATEST_VERSION)
        set(IPP_INCLUDE_DIRS ${IPP_ROOT_DIR}/include PARENT_SCOPE)

        if (APPLE)
-            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib)
+            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib PARENT_SCOPE)
        elseif (IPP_X64)
            if(NOT EXISTS ${IPP_ROOT_DIR}/lib/intel64)
                message(SEND_ERROR "IPP EM64T libraries not found")
            endif()
-            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/intel64)
+            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/intel64 PARENT_SCOPE)
        else()
            if(NOT EXISTS ${IPP_ROOT_DIR}/lib/ia32)
                message(SEND_ERROR "IPP IA32 libraries not found")
            endif()
-            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32)
+            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE)
        endif()

-        if (UNIX)
-            get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../lib REALPATH)
-            if (IPP_X64)
-                if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}/intel64)
-                    message(SEND_ERROR "Intel compiler EM64T libraries not found")
-                endif()
-                set(IPP_LIBRARY_DIRS
-                    ${IPP_LIBRARY_DIRS}
-                    ${INTEL_COMPILER_LIBRARY_DIR}/intel64)
-            else()
-                if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}/ia32)
-                    message(SEND_ERROR "Intel compiler IA32 libraries not found")
-                endif()
-                set(IPP_LIBRARY_DIRS
-                    ${IPP_LIBRARY_DIRS}
-                    ${INTEL_COMPILER_LIBRARY_DIR}/ia32)
-            endif()
-        endif()
-        set(IPP_LIBRARY_DIRS ${IPP_LIBRARY_DIRS} PARENT_SCOPE)
-
        # set IPP_LIBRARIES variable (7.x or 8.x lib names)
        set_ipp_new_libraries(${_LATEST_VERSION})
        set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
@@ -46,25 +46,8 @@ else()
  set(HAVE_CSTRIPES 0)
 endif()

-# --- GCD ---
-if(APPLE AND NOT HAVE_TBB AND NOT HAVE_CSTRIPES)
-  set(HAVE_GCD 1)
-else()
-  set(HAVE_GCD 0)
-endif()
-
-# --- Concurrency ---
-if(MSVC AND NOT HAVE_TBB AND NOT HAVE_CSTRIPES)
-  set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/concurrencytest.cpp")
-  file(WRITE "${_fname}" "#if _MSC_VER < 1600\n#error\n#endif\nint main() { return 0; }\n")
-  try_compile(HAVE_CONCURRENCY "${CMAKE_BINARY_DIR}" "${_fname}")
-  file(REMOVE "${_fname}")
-else()
-  set(HAVE_CONCURRENCY 0)
-endif()
-
 # --- OpenMP ---
-if(WITH_OPENMP)
+if(WITH_OPENMP AND NOT HAVE_TBB AND NOT HAVE_CSTRIPES)
  find_package(OpenMP)
  if(OPENMP_FOUND)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
@@ -72,3 +55,20 @@ if(WITH_OPENMP)
  endif()
  set(HAVE_OPENMP "${OPENMP_FOUND}")
 endif()
+
+# --- GCD ---
+if(APPLE AND NOT HAVE_TBB AND NOT HAVE_CSTRIPES AND NOT HAVE_OPENMP)
+  set(HAVE_GCD 1)
+else()
+  set(HAVE_GCD 0)
+endif()
+
+# --- Concurrency ---
+if(MSVC AND NOT HAVE_TBB AND NOT HAVE_CSTRIPES AND NOT HAVE_OPENMP)
+  set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/concurrencytest.cpp")
+  file(WRITE "${_fname}" "#if _MSC_VER < 1600\n#error\n#endif\nint main() { return 0; }\n")
+  try_compile(HAVE_CONCURRENCY "${CMAKE_BINARY_DIR}" "${_fname}")
+  file(REMOVE "${_fname}")
+else()
+  set(HAVE_CONCURRENCY 0)
+endif()
@@ -12,51 +12,16 @@ endif(WITH_VFW)

 # --- GStreamer ---
 ocv_clear_vars(HAVE_GSTREAMER)
-# try to find gstreamer 1.x first
 if(WITH_GSTREAMER)
-  CHECK_MODULE(gstreamer-base-1.0 HAVE_GSTREAMER_BASE)
-  CHECK_MODULE(gstreamer-video-1.0 HAVE_GSTREAMER_VIDEO)
-  CHECK_MODULE(gstreamer-app-1.0 HAVE_GSTREAMER_APP)
-  CHECK_MODULE(gstreamer-riff-1.0 HAVE_GSTREAMER_RIFF)
-  CHECK_MODULE(gstreamer-pbutils-1.0 HAVE_GSTREAMER_PBUTILS)
-
-  if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
-      set(HAVE_GSTREAMER TRUE)
-      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-1.0_VERSION})
-      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-1.0_VERSION})
-      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-1.0_VERSION})
-      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-1.0_VERSION})
-      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-1.0_VERSION})
+  CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER)
+  if(HAVE_GSTREAMER)
+    CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER)
+  endif()
+  if(HAVE_GSTREAMER)
+    CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER)
  endif()
-
 endif(WITH_GSTREAMER)

-# gstreamer support was requested but could not find gstreamer 1.x,
-# so fallback/try to find gstreamer 0.10
-if(WITH_GSTREAMER AND NOT HAVE_GSTREAMER)
-  set(WITH_GSTREAMER_0_10 ON)
-endif()
-
-# if gstreamer 1.x was not found (fallback on gstreamer 0.10), or we specified
-# we wanted gstreamer 0.10 support,
-# then try to find it if not gstreamer support has not been found so far.
-if(WITH_GSTREAMER_0_10 AND NOT HAVE_GSTREAMER)
-  CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER_BASE)
-  CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER_VIDEO)
-  CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP)
-  CHECK_MODULE(gstreamer-riff-0.10 HAVE_GSTREAMER_RIFF)
-  CHECK_MODULE(gstreamer-pbutils-0.10 HAVE_GSTREAMER_PBUTILS)
-
-  if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
-      set(HAVE_GSTREAMER TRUE)
-      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-0.10_VERSION})
-      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-0.10_VERSION})
-      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-0.10_VERSION})
-      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-0.10_VERSION})
-      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-0.10_VERSION})
-  endif()
-endif(WITH_GSTREAMER_0_10 AND NOT HAVE_GSTREAMER)
-
 # --- unicap ---
 ocv_clear_vars(HAVE_UNICAP)
 if(WITH_UNICAP)
@@ -161,13 +126,7 @@ endif(WITH_XINE)
 ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HAVE_VIDEOIO)
 if(WITH_V4L)
  if(WITH_LIBV4L)
-    CHECK_MODULE(libv4l1 HAVE_LIBV4L1)
-    CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
-    if(HAVE_LIBV4L1 AND HAVE_LIBV4L2)
-      set(HAVE_LIBV4L YES)
-    else()
-      set(HAVE_LIBV4L NO)
-    endif()
+    CHECK_MODULE(libv4l1 HAVE_LIBV4L)
  endif()
  CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
  CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
@@ -218,35 +177,42 @@ if(WITH_FFMPEG)
        # Do an other trial
        FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib)
      endif()
-    else()
-      find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h"
-                PATHS /usr/local /usr /opt
-                PATH_SUFFIXES include
-                DOC "The path to FFMPEG headers")
-      if(FFMPEG_INCLUDE_DIR)
-        set(HAVE_GENTOO_FFMPEG TRUE)
-        set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory")
-        find_library(FFMPEG_CODEC_LIB "avcodec" HINTS "${FFMPEG_LIB_DIR}")
-        find_library(FFMPEG_FORMAT_LIB "avformat" HINTS "${FFMPEG_LIB_DIR}")
-        find_library(FFMPEG_UTIL_LIB "avutil" HINTS "${FFMPEG_LIB_DIR}")
-        find_library(FFMPEG_SWSCALE_LIB "swscale" HINTS "${FFMPEG_LIB_DIR}")
-        if(FFMPEG_CODEC_LIB AND FFMPEG_FORMAT_LIB AND
-           FFMPEG_UTIL_LIB AND FFMPEG_SWSCALE_LIB)
-          set(ALIASOF_libavcodec_VERSION "Unknown")
-          set(ALIASOF_libavformat_VERSION "Unknown")
-          set(ALIASOF_libavutil_VERSION "Unknown")
-          set(ALIASOF_libswscale_VERSION "Unknown")
-          set(HAVE_FFMPEG 1)
-        endif()
-      endif(FFMPEG_INCLUDE_DIR)
-      if(HAVE_FFMPEG)
-        set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES}
-            ${FFMPEG_CODEC_LIB} ${FFMPEG_FORMAT_LIB}
-            ${FFMPEG_UTIL_LIB} ${FFMPEG_SWSCALE_LIB})
-        ocv_include_directories(${FFMPEG_INCLUDE_DIR})
-      endif(HAVE_FFMPEG)
-    endif()
+    endif(HAVE_FFMPEG)
  endif()
+
+  if(APPLE)
+    find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h"
+              PATHS /usr/local /usr /opt
+              PATH_SUFFIXES include
+              DOC "The path to FFMPEG headers")
+    if(FFMPEG_INCLUDE_DIR)
+      set(HAVE_GENTOO_FFMPEG TRUE)
+      set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory")
+      if(EXISTS "${FFMPEG_LIB_DIR}/libavcodec.a")
+        set(HAVE_FFMPEG_CODEC 1)
+        set(ALIASOF_libavcodec_VERSION "Unknown")
+        if(EXISTS "${FFMPEG_LIB_DIR}/libavformat.a")
+          set(HAVE_FFMPEG_FORMAT 1)
+          set(ALIASOF_libavformat_VERSION "Unknown")
+          if(EXISTS "${FFMPEG_LIB_DIR}/libavutil.a")
+            set(HAVE_FFMPEG_UTIL 1)
+            set(ALIASOF_libavutil_VERSION "Unknown")
+            if(EXISTS "${FFMPEG_LIB_DIR}/libswscale.a")
+              set(HAVE_FFMPEG_SWSCALE 1)
+              set(ALIASOF_libswscale_VERSION "Unknown")
+              set(HAVE_FFMPEG 1)
+            endif()
+          endif()
+        endif()
+      endif()
+    endif(FFMPEG_INCLUDE_DIR)
+    if(HAVE_FFMPEG)
+      set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} "${FFMPEG_LIB_DIR}/libavcodec.a"
+          "${FFMPEG_LIB_DIR}/libavformat.a" "${FFMPEG_LIB_DIR}/libavutil.a"
+          "${FFMPEG_LIB_DIR}/libswscale.a")
+      ocv_include_directories(${FFMPEG_INCLUDE_DIR})
+    endif()
+  endif(APPLE)
 endif(WITH_FFMPEG)

 # --- VideoInput/DirectShow ---
@@ -256,7 +222,6 @@ if(WITH_DSHOW)
 endif(WITH_DSHOW)

 # --- VideoInput/Microsoft Media Foundation ---
-ocv_clear_vars(HAVE_MSMF)
 if(WITH_MSMF)
  check_include_file(Mfapi.h HAVE_MSMF)
 endif(WITH_MSMF)
@@ -31,12 +31,6 @@ if(WIN32)
  else()
    set(XIMEA_FOUND 0)
  endif()
-elseif(APPLE)
-  if(EXISTS /Library/Frameworks/m3api.framework)
-    set(XIMEA_FOUND 1)
-  else()
-    set(XIMEA_FOUND 0)
-  endif()
 else()
  if(EXISTS /opt/XIMEA)
    set(XIMEA_FOUND 1)
@@ -19,22 +19,6 @@ if(ANDROID)
    set(OPENCV_STATIC_LIBTYPE_CONFIGMAKE ${OPENCV_LIBTYPE_CONFIGMAKE})
  endif()

-  if (NOT COMMAND ANDROID_GET_ABI_RAWNAME)
-    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" )
-      elseif( " ${TOOLCHAIN_FLAG}" STREQUAL " MIPS" )
-        set( ${VAR} "mips" )
-      else()
-        set( ${VAR} "unknown" )
-      endif()
-    endmacro()
-  endif()
-
  # setup lists of camera libs
  foreach(abi ARMEABI ARMEABI_V7A X86 MIPS)
    ANDROID_GET_ABI_RAWNAME(${abi} ndkabi)
@@ -72,11 +56,8 @@ if(ANDROID)

  # remove CUDA runtime and NPP from regular deps
  # it can be added separately if needed.
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cusparse")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cufft")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cublas")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "npp")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cudart")
+  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libcu")
+  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libnpp")

  if(HAVE_CUDA)
    # CUDA runtime libraries and are required always
@@ -147,7 +128,7 @@ if(ANDROID)
  set(OPENCV_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/lib/\$(OPENCV_TARGET_ARCH_ABI)")
  set(OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/3rdparty/lib/\$(OPENCV_TARGET_ARCH_ABI)")

-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/OpenCV.mk" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/OpenCV.mk" IMMEDIATE @ONLY)

  # -------------------------------------------------------------------------------------------
  #  Part 2/2: ${BIN_DIR}/unix-install/OpenCV.mk -> For use with "make install"
@@ -157,6 +138,6 @@ if(ANDROID)
  set(OPENCV_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../libs/\$(OPENCV_TARGET_ARCH_ABI)")
  set(OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../3rdparty/libs/\$(OPENCV_TARGET_ARCH_ABI)")

-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
  install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev)
 endif(ANDROID)
@@ -83,9 +83,9 @@ endif()

 export(TARGETS ${OpenCVModules_TARGETS} FILE "${CMAKE_BINARY_DIR}/OpenCVModules${modules_file_suffix}.cmake")

-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" IMMEDIATE @ONLY)
 #support for version checking when finding opencv. find_package(OpenCV 2.3.1 EXACT) should now work.
-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig-version.cmake" @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)

 # --------------------------------------------------------------------------------------------
 #  Part 2/3: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"
@@ -98,8 +98,8 @@ if(INSTALL_TO_MANGLED_PATHS)
  set(OpenCV_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OpenCV_3RDPARTY_LIB_DIRS_CONFIGCMAKE}\"")
 endif()

-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" @ONLY)
-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake" @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)

 if(UNIX) # ANDROID configuration is created here also
  #http://www.vtk.org/Wiki/CMake/Tutorials/Packaging reference
@@ -131,8 +131,8 @@ if(WIN32)
  set(OpenCV2_INCLUDE_DIRS_CONFIGCMAKE "\"\"")

  exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" @ONLY)
-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)
  if(BUILD_SHARED_LIBS)
    install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${OpenCV_INSTALL_BINARIES_PREFIX}lib" COMPONENT dev)
    install(EXPORT OpenCVModules DESTINATION "${OpenCV_INSTALL_BINARIES_PREFIX}lib" FILE OpenCVModules${modules_file_suffix}.cmake COMPONENT dev)
@@ -140,6 +140,6 @@ if(WIN32)
    install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib" COMPONENT dev)
    install(EXPORT OpenCVModules DESTINATION "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib" FILE OpenCVModules${modules_file_suffix}.cmake COMPONENT dev)
  endif()
-  install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" DESTINATION "." COMPONENT dev)
-  install(FILES "${OpenCV_SOURCE_DIR}/cmake/OpenCVConfig.cmake" DESTINATION "." COMPONENT dev)
+  install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}" COMPONENT dev)
+  install(FILES "${OpenCV_SOURCE_DIR}/cmake/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/" COMPONENT dev)
 endif()
@@ -8,6 +8,10 @@
 #
 # ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"
 # -------------------------------------------------------------------------------------------
+set(prefix      "${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
+set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")

 if(CMAKE_BUILD_TYPE MATCHES "Release")
  set(ocv_optkind OPT)
@@ -31,66 +35,42 @@ ocv_list_reverse(OpenCV_LIB_COMPONENTS)
 ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)

 #build the list of components
-
-# Note:
-#   when linking against static libraries, if libfoo depends on libbar, then
-#   libfoo must come first in the linker flags.
-
-# world is a special target whose library should come first, especially for
-# static link.
-if(OpenCV_LIB_COMPONENTS MATCHES "opencv_world")
-  list(REMOVE_ITEM OpenCV_LIB_COMPONENTS "opencv_world")
-  list(INSERT OpenCV_LIB_COMPONENTS 0 "opencv_world")
-endif()
-
-set(OpenCV_LIB_COMPONENTS_)
+set(OpenCV_LIB_COMPONENTS_ "")
 foreach(CVLib ${OpenCV_LIB_COMPONENTS})
+  get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
+  get_filename_component(libname "${libpath}" NAME)

-  get_target_property(libloc ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
-  if(libloc MATCHES "3rdparty")
-    set(libpath "\${exec_prefix}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
-  else()
-    set(libpath "\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}")
+  if(INSTALL_TO_MANGLED_PATHS)
+    set(libname "${libname}.${OPENCV_VERSION}")
  endif()
-  list(APPEND OpenCV_LIB_COMPONENTS_ "-L${libpath}")

-  get_filename_component(libname ${CVLib} NAME_WE)
-  string(REGEX REPLACE "^lib" "" libname "${libname}")
-  list(APPEND OpenCV_LIB_COMPONENTS_ "-l${libname}")
+  #need better solution....
+  if(libpath MATCHES "3rdparty")
+    set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
+  else()
+    set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+  endif()

+  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
 endforeach()

 # add extra dependencies required for OpenCV
+set(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS_})
 if(OpenCV_EXTRA_COMPONENTS)
  foreach(extra_component ${OpenCV_EXTRA_COMPONENTS})

-    if(extra_component MATCHES "^-[lL]")
-      set(libprefix "")
-      set(libname "${extra_component}")
-    elseif(extra_component MATCHES "[\\/]")
-      get_filename_component(libdir "${extra_component}" PATH)
-      list(APPEND OpenCV_LIB_COMPONENTS_ "-L${libdir}")
-      get_filename_component(libname "${extra_component}" NAME_WE)
-      string(REGEX REPLACE "^lib" "" libname "${libname}")
-      set(libprefix "-l")
+    if(extra_component MATCHES "^-[lL]" OR extra_component MATCHES "[\\/]")
+      set(maybe_l_prefix "")
    else()
-      set(libprefix "-l")
-      set(libname "${extra_component}")
+      set(maybe_l_prefix "-l")
    endif()
-    list(APPEND OpenCV_LIB_COMPONENTS_ "${libprefix}${libname}")
+
+    set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} ${maybe_l_prefix}${extra_component}")

  endforeach()
 endif()

-list(REMOVE_DUPLICATES OpenCV_LIB_COMPONENTS_)
-string(REPLACE ";" " " OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS_}")
-
 #generate the .pc file
-set(prefix      "${CMAKE_INSTALL_PREFIX}")
-set(exec_prefix "\${prefix}")
-set(libdir      "\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}")
-set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
-
 if(INSTALL_TO_MANGLED_PATHS)
  set(OPENCV_PC_FILE_NAME "opencv-${OPENCV_VERSION}.pc")
 else()
@@ -98,7 +78,7 @@ else()
 endif()
 configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv-XXX.pc.in"
               "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}"
-               @ONLY)
+               @ONLY IMMEDIATE)

 if(UNIX AND NOT ANDROID)
  install(FILES ${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME} DESTINATION ${OPENCV_LIB_INSTALL_PATH}/pkgconfig COMPONENT dev)
@@ -27,8 +27,7 @@
 # The verbose template for OpenCV module:
 #
 #   ocv_add_module(modname <dependencies>)
-#   ocv_glob_module_sources(([EXCLUDE_CUDA] <extra sources&headers>)
-#                          or glob them manually and ocv_set_module_sources(...)
+#   ocv_glob_module_sources() or glob them manually and ocv_set_module_sources(...)
 #   ocv_module_include_directories(<extra include directories>)
 #   ocv_create_module()
 #   <add extra link dependencies, compiler options, etc>
@@ -106,6 +105,7 @@ endmacro()
 #   ocv_add_module(yaom INTERNAL opencv_core opencv_highgui opencv_flann OPTIONAL opencv_gpu)
 macro(ocv_add_module _name)
  string(TOLOWER "${_name}" name)
+  string(REGEX REPLACE "^opencv_" "" ${name} "${name}")
  set(the_module opencv_${name})

  # the first pass - collect modules info, the second pass - create targets
@@ -135,13 +135,13 @@ macro(ocv_add_module _name)

    # parse list of dependencies
    if("${ARGV1}" STREQUAL "INTERNAL" OR "${ARGV1}" STREQUAL "BINDINGS")
-      set(OPENCV_MODULE_${the_module}_CLASS "${ARGV1}" CACHE INTERNAL "The category of the module")
+      set(OPENCV_MODULE_${the_module}_CLASS "${ARGV1}" CACHE INTERNAL "The cathegory of the module")
      set(__ocv_argn__ ${ARGN})
      list(REMOVE_AT __ocv_argn__ 0)
      ocv_add_dependencies(${the_module} ${__ocv_argn__})
      unset(__ocv_argn__)
    else()
-      set(OPENCV_MODULE_${the_module}_CLASS "PUBLIC" CACHE INTERNAL "The category of the module")
+      set(OPENCV_MODULE_${the_module}_CLASS "PUBLIC" CACHE INTERNAL "The cathegory of the module")
      ocv_add_dependencies(${the_module} ${ARGN})
      if(BUILD_${the_module})
        set(OPENCV_MODULES_PUBLIC ${OPENCV_MODULES_PUBLIC} "${the_module}" CACHE INTERNAL "List of OpenCV modules marked for export")
@@ -478,38 +478,22 @@ endmacro()

 # finds and sets headers and sources for the standard OpenCV module
 # Usage:
-# ocv_glob_module_sources([EXCLUDE_CUDA] <extra sources&headers in the same format as used in ocv_set_module_sources>)
+# ocv_glob_module_sources(<extra sources&headers in the same format as used in ocv_set_module_sources>)
 macro(ocv_glob_module_sources)
-  set(_argn ${ARGN})
-  list(FIND _argn "EXCLUDE_CUDA" exclude_cuda)
-  if(NOT exclude_cuda EQUAL -1)
-    list(REMOVE_AT _argn ${exclude_cuda})
-  endif()
-
  file(GLOB_RECURSE lib_srcs "src/*.cpp")
  file(GLOB_RECURSE lib_int_hdrs "src/*.hpp" "src/*.h")
  file(GLOB lib_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
  file(GLOB lib_hdrs_detail "include/opencv2/${name}/detail/*.hpp" "include/opencv2/${name}/detail/*.h")
-  file(GLOB_RECURSE lib_srcs_apple "src/*.mm")
-  if (APPLE)
-    list(APPEND lib_srcs ${lib_srcs_apple})
-  endif()

-  if (exclude_cuda EQUAL -1)
-    file(GLOB lib_cuda_srcs "src/cuda/*.cu")
-    set(cuda_objs "")
-    set(lib_cuda_hdrs "")
-    if(HAVE_CUDA)
-      ocv_include_directories(${CUDA_INCLUDE_DIRS})
-      file(GLOB lib_cuda_hdrs "src/cuda/*.hpp")
+  file(GLOB lib_cuda_srcs "src/cuda/*.cu")
+  set(cuda_objs "")
+  set(lib_cuda_hdrs "")
+  if(HAVE_CUDA)
+    ocv_include_directories(${CUDA_INCLUDE_DIRS})
+    file(GLOB lib_cuda_hdrs "src/cuda/*.hpp")

-      ocv_cuda_compile(cuda_objs ${lib_cuda_srcs} ${lib_cuda_hdrs})
-      source_group("Src\\Cuda"      FILES ${lib_cuda_srcs} ${lib_cuda_hdrs})
-    endif()
-  else()
-    set(cuda_objs "")
-    set(lib_cuda_srcs "")
-    set(lib_cuda_hdrs "")
+    ocv_cuda_compile(cuda_objs ${lib_cuda_srcs} ${lib_cuda_hdrs})
+    source_group("Src\\Cuda"      FILES ${lib_cuda_srcs} ${lib_cuda_hdrs})
  endif()

  source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
@@ -525,33 +509,11 @@ macro(ocv_glob_module_sources)
    list(APPEND lib_srcs ${cl_kernels} "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp")
  endif()

-  if(ENABLE_AVX)
-    file(GLOB avx_srcs "src/avx/*.cpp")
-    foreach(src ${avx_srcs})
-      if(CMAKE_COMPILER_IS_GNUCXX)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS -mavx)
-      elseif(MSVC AND NOT MSVC_VERSION LESS 1600)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS /arch:AVX)
-      endif()
-    endforeach()
-  endif()
-
-  if(ENABLE_AVX2)
-    file(GLOB avx2_srcs "src/avx2/*.cpp")
-    foreach(src ${avx2_srcs})
-      if(CMAKE_COMPILER_IS_GNUCXX)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS -mavx2)
-      elseif(MSVC AND NOT MSVC_VERSION LESS 1800)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS /arch:AVX2)
-      endif()
-    endforeach()
-  endif()
-
  source_group("Include" FILES ${lib_hdrs})
  source_group("Include\\detail" FILES ${lib_hdrs_detail})

-  ocv_set_module_sources(${_argn} HEADERS ${lib_hdrs} ${lib_hdrs_detail}
-                         SOURCES ${lib_srcs} ${lib_int_hdrs} ${cuda_objs} ${lib_cuda_srcs} ${lib_cuda_hdrs})
+  ocv_set_module_sources(${ARGN} HEADERS ${lib_hdrs} ${lib_hdrs_detail}
+                                 SOURCES ${lib_srcs} ${lib_int_hdrs} ${cuda_objs} ${lib_cuda_srcs} ${lib_cuda_hdrs})
 endmacro()

 # creates OpenCV module in current folder
@@ -616,14 +578,9 @@ macro(ocv_create_module)

  ocv_install_target(${the_module} EXPORT OpenCVModules
    RUNTIME DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT libs
-    LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT libs NAMELINK_SKIP
+    LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT libs
    ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT dev
    )
-  get_target_property(_target_type ${the_module} TYPE)
-  if("${_target_type}" STREQUAL "SHARED_LIBRARY")
-    install(TARGETS ${the_module}
-      LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT dev NAMELINK_ONLY)
-  endif()

  # only "public" headers need to be installed
  if(OPENCV_MODULE_${the_module}_HEADERS AND ";${OPENCV_MODULES_PUBLIC};" MATCHES ";${the_module};")
@@ -655,20 +612,11 @@ endmacro()
 # short command for adding simple OpenCV module
 # see ocv_add_module for argument details
 # Usage:
-# ocv_define_module(module_name  [INTERNAL] [EXCLUDE_CUDA] [REQUIRED] [<list of dependencies>] [OPTIONAL <list of optional dependencies>])
+# ocv_define_module(module_name  [INTERNAL] [REQUIRED] [<list of dependencies>] [OPTIONAL <list of optional dependencies>])
 macro(ocv_define_module module_name)
-  set(_argn ${ARGN})
-  set(exclude_cuda "")
-  foreach(arg ${_argn})
-    if("${arg}" STREQUAL "EXCLUDE_CUDA")
-      set(exclude_cuda "${arg}")
-      list(REMOVE_ITEM _argn ${arg})
-    endif()
-  endforeach()
-
-  ocv_add_module(${module_name} ${_argn})
+  ocv_add_module(${module_name} ${ARGN})
  ocv_module_include_directories()
-  ocv_glob_module_sources(${exclude_cuda})
+  ocv_glob_module_sources()
  ocv_create_module()
  ocv_add_precompiled_headers(${the_module})

@@ -706,7 +654,7 @@ macro(__ocv_parse_test_sources tests_type)
      set(__file_group_sources "")
    elseif(arg STREQUAL "DEPENDS_ON")
      set(__currentvar "OPENCV_TEST_${the_module}_DEPS")
-    elseif(" ${__currentvar}" STREQUAL " __file_group_sources" AND NOT __file_group_name) # spaces to avoid CMP0054
+    elseif("${__currentvar}" STREQUAL "__file_group_sources" AND NOT __file_group_name)
      set(__file_group_name "${arg}")
    else()
      list(APPEND ${__currentvar} "${arg}")
@@ -760,22 +708,6 @@ function(ocv_add_perf_tests)

      ocv_add_precompiled_headers(${the_target})

-      if(CMAKE_VERSION VERSION_GREATER "2.8" AND OPENCV_TEST_DATA_PATH)
-        add_test(NAME ${the_target} COMMAND ${the_target} --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity)
-
-        get_filename_component(cur_modules_loc "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
-        get_filename_component(default_modules_loc "${CMAKE_SOURCE_DIR}/modules" ABSOLUTE)
-        if("${cur_modules_loc}" STREQUAL "${default_modules_loc}")
-          set(test_category "Public")
-        else()
-          set(test_category "Extra")
-        endif()
-
-        set_tests_properties(${the_target} PROPERTIES
-          LABELS "${test_category};Sanity"
-          ENVIRONMENT "OPENCV_TEST_DATA_PATH=${OPENCV_TEST_DATA_PATH}")
-      endif()
-
    else(OCV_DEPENDENCIES_FOUND)
      # TODO: warn about unsatisfied dependencies
    endif(OCV_DEPENDENCIES_FOUND)
@@ -812,8 +744,8 @@ function(ocv_add_accuracy_tests)
      endif()

      get_native_precompiled_header(${the_target} test_precomp.hpp)
-      add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})

+      add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})
      target_link_libraries(${the_target} ${OPENCV_MODULE_${the_module}_DEPS} ${test_deps} ${OPENCV_LINKER_LIBS})
      add_dependencies(opencv_tests ${the_target})

@@ -827,24 +759,11 @@ function(ocv_add_accuracy_tests)
        set_target_properties(${the_target} PROPERTIES FOLDER "tests accuracy")
      endif()

+      enable_testing()
+      get_target_property(LOC ${the_target} LOCATION)
+      add_test(${the_target} "${LOC}")
+
      ocv_add_precompiled_headers(${the_target})
-
-      if(CMAKE_VERSION VERSION_GREATER "2.8" AND OPENCV_TEST_DATA_PATH AND NOT "${the_target}" MATCHES "opencv_test_viz")
-        add_test(NAME ${the_target} COMMAND ${the_target})
-
-        get_filename_component(cur_modules_loc "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
-        get_filename_component(default_modules_loc "${CMAKE_SOURCE_DIR}/modules" ABSOLUTE)
-        if("${cur_modules_loc}" STREQUAL "${default_modules_loc}")
-          set(test_category "Public")
-        else()
-          set(test_category "Extra")
-        endif()
-
-        set_tests_properties(${the_target} PROPERTIES
-          LABELS "${test_category};Accuracy"
-          ENVIRONMENT "OPENCV_TEST_DATA_PATH=${OPENCV_TEST_DATA_PATH}")
-      endif()
-
    else(OCV_DEPENDENCIES_FOUND)
      # TODO: warn about unsatisfied dependencies
    endif(OCV_DEPENDENCIES_FOUND)
@@ -893,7 +812,7 @@ function(ocv_add_samples)
    file(GLOB sample_files "${samples_path}/*")
    install(FILES ${sample_files}
            DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/${module_id}
-            PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
+            PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
  endif()
 endfunction()

@@ -924,7 +843,7 @@ macro(__ocv_track_module_link_dependencies the_module optkind)
        if(__resolved_deps MATCHES "(^|;)${__rdep}(;|$)")
          #all dependencies of this module are already resolved
          list(APPEND ${the_module}_MODULE_DEPS_${optkind} "${__dep}")
-        elseif(TARGET ${__dep})
+        else()
          get_target_property(__module_type ${__dep} TYPE)
          if(__module_type STREQUAL "STATIC_LIBRARY")
            if(NOT DEFINED ${__dep}_LIB_DEPENDS_${optkind})
@@ -932,9 +851,9 @@ macro(__ocv_track_module_link_dependencies the_module optkind)
            endif()
            list(INSERT __mod_depends 0 ${${__dep}_LIB_DEPENDS_${optkind}} ${__dep})
            list(APPEND __resolved_deps "${__dep}")
+          elseif(NOT __module_type)
+            list(APPEND  ${the_module}_EXTRA_DEPS_${optkind} "${__dep}")
          endif()
-        else()
-          list(APPEND  ${the_module}_EXTRA_DEPS_${optkind} "${__dep}")
        endif()
      #else()
       # get_target_property(__dep_location "${__dep}" LOCATION)
@@ -41,15 +41,16 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
    STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
    SET(${_out_compile_flags} ${${_flags_var_name}} )

-    GET_TARGET_PROPERTY(_targetPIC ${_PCH_current_target} POSITION_INDEPENDENT_CODE)
-    if (_targetPIC AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
-      LIST(APPEND ${_out_compile_flags} "${CMAKE_CXX_COMPILE_OPTIONS_PIC}")
-    elseif(CMAKE_COMPILER_IS_GNUCXX)
-      GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
-      IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
-        LIST(APPEND ${_out_compile_flags} "-fPIC")
-      ENDIF()
-    endif()
+    IF(CMAKE_COMPILER_IS_GNUCXX)
+
+        GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
+        IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
+            LIST(APPEND ${_out_compile_flags} "-fPIC")
+        ENDIF()
+
+    ELSE()
+        ## TODO ... ? or does it work out of the box
+    ENDIF()

    GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
    FOREACH(item ${DIRINC})
@@ -146,9 +147,9 @@ MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags  _header_name _pch_path _dowarn )
        # if you have different versions of the headers for different build types
        # you may set _pch_dowarn
        IF (_dowarn)
-            set(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -Winvalid-pch")
+            SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" -Winvalid-pch " )
        ELSE (_dowarn)
-            set(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS}")
+            SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" " )
        ENDIF (_dowarn)

    ELSE(CMAKE_COMPILER_IS_GNUCXX)
@@ -1,6 +1,3 @@
-# Use patched version of CPACK to build accurate set of Debian packages
-# https://github.com/asmorkalov/CMake/tree/deb_generator_improvement
-
 if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 set(CPACK_set_DESTDIR "on")

@@ -14,15 +11,13 @@ machine perception in the commercial products. Being a BSD-licensed product,
 OpenCV makes it easy for businesses to utilize and modify the code.")
  set(CPACK_PACKAGE_VENDOR "OpenCV Foundation")
  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-  set(CPACK_PACKAGE_CONTACT "OpenCV Developers <admin@opencv.org>")
+  set(CPACK_PACKAGE_CONTACT "admin@opencv.org")
  set(CPACK_PACKAGE_VERSION_MAJOR "${OPENCV_VERSION_MAJOR}")
  set(CPACK_PACKAGE_VERSION_MINOR "${OPENCV_VERSION_MINOR}")
  set(CPACK_PACKAGE_VERSION_PATCH "${OPENCV_VERSION_PATCH}")
  set(CPACK_PACKAGE_VERSION "${OPENCV_VCSVERSION}")
 endif(NOT OPENCV_CUSTOM_PACKAGE_INFO)

-set(CPACK_STRIP_FILES 1)
-
 #arch
 if(X86)
  set(CPACK_DEBIAN_ARCHITECTURE "i386")
@@ -62,107 +57,68 @@ set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://opencv.org")

-#display names
-set(CPACK_COMPONENT_DEV_DISPLAY_NAME     "Development files")
-set(CPACK_COMPONENT_DOCS_DISPLAY_NAME    "Documentation")
-set(CPACK_COMPONENT_JAVA_DISPLAY_NAME    "Java bindings")
-set(CPACK_COMPONENT_LIBS_DISPLAY_NAME    "Libraries and data")
-set(CPACK_COMPONENT_PYTHON_DISPLAY_NAME  "Python bindings")
-set(CPACK_COMPONENT_SAMPLES_DISPLAY_NAME "Samples")
-set(CPACK_COMPONENT_TESTS_DISPLAY_NAME   "Tests")
-
 #depencencies
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS TRUE)
-set(CPACK_COMPONENT_LIBS_REQUIRED TRUE)
-set(CPACK_COMPONENT_SAMPLES_DEPENDS libs dev)
-set(CPACK_COMPONENT_DEV_DEPENDS libs)
-set(CPACK_COMPONENT_DOCS_DEPENDS libs)
-set(CPACK_COMPONENT_JAVA_DEPENDS libs)
-set(CPACK_COMPONENT_PYTHON_DEPENDS libs)
-set(CPACK_DEB_PYTHON_PACKAGE_DEPENDS "python-numpy (>=${PYTHON_NUMPY_VERSION}), python${PYTHON_VERSION_MAJOR_MINOR}")
-set(CPACK_COMPONENT_TESTS_DEPENDS libs)
-if (HAVE_opencv_python)
-  set(CPACK_DEB_TESTS_PACKAGE_DEPENDS "python-numpy (>=${PYTHON_NUMPY_VERSION}), python${PYTHON_VERSION_MAJOR_MINOR}, python-py | python-pytest")
-endif()
+set(CPACK_COMPONENT_samples_DEPENDS libs)
+set(CPACK_COMPONENT_dev_DEPENDS libs)
+set(CPACK_COMPONENT_docs_DEPENDS libs)
+set(CPACK_COMPONENT_java_DEPENDS libs)
+set(CPACK_COMPONENT_python_DEPENDS libs)
+set(CPACK_COMPONENT_tests_DEPENDS libs)

 if(HAVE_CUDA)
  string(REPLACE "." "-" cuda_version_suffix ${CUDA_VERSION})
  if(CUDA_VERSION VERSION_LESS "6.5")
-    set(CPACK_DEB_LIBS_PACKAGE_DEPENDS "cuda-core-libs-${cuda_version_suffix}, cuda-extra-libs-${cuda_version_suffix}")
-    set(CPACK_DEB_DEV_PACKAGE_DEPENDS "cuda-headers-${cuda_version_suffix}")
+    set(CPACK_DEB_libs_PACKAGE_DEPENDS "cuda-core-libs-${cuda_version_suffix}, cuda-extra-libs-${cuda_version_suffix}")
+    set(CPACK_DEB_dev_PACKAGE_DEPENDS "cuda-headers-${cuda_version_suffix}")
  else()
-    set(CPACK_DEB_LIBS_PACKAGE_DEPENDS "cuda-cudart-${cuda_version_suffix}, cuda-npp-${cuda_version_suffix}")
-    set(CPACK_DEB_DEV_PACKAGE_DEPENDS "cuda-cudart-dev-${cuda_version_suffix}, cuda-npp-dev-${cuda_version_suffix}")
+    set(CPACK_DEB_libs_PACKAGE_DEPENDS "cuda-cudart-${cuda_version_suffix}, cuda-npp-${cuda_version_suffix}")
+    set(CPACK_DEB_dev_PACKAGE_DEPENDS "cuda-cudart-dev-${cuda_version_suffix}, cuda-npp-dev-${cuda_version_suffix}")
    if(HAVE_CUFFT)
-      set(CPACK_DEB_LIBS_PACKAGE_DEPENDS "${CPACK_DEB_LIBS_PACKAGE_DEPENDS}, cuda-cufft-${cuda_version_suffix}")
-      set(CPACK_DEB_DEV_PACKAGE_DEPENDS "${CPACK_DEB_DEV_PACKAGE_DEPENDS}, cuda-cufft-dev-${cuda_version_suffix}")
+      set(CPACK_DEB_libs_PACKAGE_DEPENDS "${CPACK_DEB_libs_PACKAGE_DEPENDS}, cuda-cufft-${cuda_version_suffix}")
+      set(CPACK_DEB_dev_PACKAGE_DEPENDS "${CPACK_DEB_dev_PACKAGE_DEPENDS}, cuda-cufft-dev-${cuda_version_suffix}")
    endif()
    if(HAVE_HAVE_CUBLAS)
-      set(CPACK_DEB_LIBS_PACKAGE_DEPENDS "${CPACK_DEB_LIBS_PACKAGE_DEPENDS}, cuda-cublas-${cuda_version_suffix}")
-      set(CPACK_DEB_DEV_PACKAGE_DEPENDS "${CPACK_DEB_DEV_PACKAGE_DEPENDS}, cuda-cublas-dev-${cuda_version_suffix}")
+      set(CPACK_DEB_libs_PACKAGE_DEPENDS "${CPACK_DEB_libs_PACKAGE_DEPENDS}, cuda-cublas-${cuda_version_suffix}")
+      set(CPACK_DEB_dev_PACKAGE_DEPENDS "${CPACK_DEB_dev_PACKAGE_DEPENDS}, cuda-cublas-dev-${cuda_version_suffix}")
    endif()
  endif()
+
+  set(CPACK_COMPONENT_dev_DEPENDS libs)
 endif()

 if(NOT OPENCV_CUSTOM_PACKAGE_INFO)
-  set(CPACK_COMPONENT_LIBS_DESCRIPTION "Open Computer Vision Library")
-  set(CPACK_DEBIAN_COMPONENT_LIBS_NAME "libopencv")
-  set(CPACK_DEBIAN_COMPONENT_LIBS_SECTION "libs")
+  set(CPACK_COMPONENT_libs_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}")
+  set(CPACK_COMPONENT_libs_DESCRIPTION "Open Computer Vision Library")

-  set(CPACK_COMPONENT_PYTHON_DESCRIPTION "Python bindings for Open Source Computer Vision Library")
-  set(CPACK_DEBIAN_COMPONENT_PYTHON_NAME "libopencv-python")
-  set(CPACK_DEBIAN_COMPONENT_PYTHON_SECTION "python")
+  set(CPACK_COMPONENT_python_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-python")
+  set(CPACK_COMPONENT_python_DESCRIPTION "Python bindings for Open Source Computer Vision Library")

-  set(CPACK_COMPONENT_JAVA_DESCRIPTION "Java bindings for Open Source Computer Vision Library")
-  set(CPACK_DEBIAN_COMPONENT_JAVA_NAME "libopencv-java")
-  set(CPACK_DEBIAN_COMPONENT_JAVA_SECTION "java")
+  set(CPACK_COMPONENT_java_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-java")
+  set(CPACK_COMPONENT_java_DESCRIPTION "Java bindings for Open Source Computer Vision Library")

-  set(CPACK_COMPONENT_DEV_DESCRIPTION "Development files for Open Source Computer Vision Library")
-  set(CPACK_DEBIAN_COMPONENT_DEV_NAME "libopencv-dev")
-  set(CPACK_DEBIAN_COMPONENT_DEV_SECTION "libdevel")
+  set(CPACK_COMPONENT_dev_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-dev")
+  set(CPACK_COMPONENT_dev_DESCRIPTION "Development files for Open Source Computer Vision Library")

-  set(CPACK_COMPONENT_DOCS_DESCRIPTION "Documentation for Open Source Computer Vision Library")
-  set(CPACK_DEBIAN_COMPONENT_DOCS_NAME "libopencv-docs")
-  set(CPACK_DEBIAN_COMPONENT_DOCS_SECTION "doc")
+  set(CPACK_COMPONENT_docs_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-docs")
+  set(CPACK_COMPONENT_docs_DESCRIPTION "Documentation for Open Source Computer Vision Library")

-  set(CPACK_COMPONENT_SAMPLES_DESCRIPTION "Samples for Open Source Computer Vision Library")
-  set(CPACK_DEBIAN_COMPONENT_SAMPLES_NAME "libopencv-samples")
-  set(CPACK_DEBIAN_COMPONENT_SAMPLES_SECTION "devel")
+  set(CPACK_COMPONENT_samples_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-samples")
+  set(CPACK_COMPONENT_samples_DESCRIPTION "Samples for Open Source Computer Vision Library")

-  set(CPACK_COMPONENT_TESTS_DESCRIPTION "Accuracy and performance tests for Open Source Computer Vision Library")
-  set(CPACK_DEBIAN_COMPONENT_TESTS_NAME "libopencv-tests")
-  set(CPACK_DEBIAN_COMPONENT_TESTS_SECTION "misc")
+  set(CPACK_COMPONENT_tests_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-tests")
+  set(CPACK_COMPONENT_tests_DESCRIPTION "Accuracy and performance tests for Open Source Computer Vision Library")
 endif(NOT OPENCV_CUSTOM_PACKAGE_INFO)

-if(CPACK_GENERATOR STREQUAL "DEB")
-  find_program(GZIP_TOOL NAMES "gzip" PATHS "/bin" "/usr/bin" "/usr/local/bin")
-  if(NOT GZIP_TOOL)
-    message(FATAL_ERROR "Unable to find 'gzip' program")
-  endif()
-
-  execute_process(COMMAND "date" "-R"
-                  OUTPUT_VARIABLE CHANGELOG_PACKAGE_DATE
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  set(CHANGELOG_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
-  set(ALL_COMPONENTS "libs" "dev" "docs" "python" "java" "samples" "tests")
-  foreach (comp ${ALL_COMPONENTS})
-    string(TOUPPER "${comp}" comp_upcase)
-    set(DEBIAN_CHANGELOG_OUT_FILE    "${CMAKE_BINARY_DIR}/deb-packages-gen/${comp}/changelog.Debian")
-    set(DEBIAN_CHANGELOG_OUT_FILE_GZ "${CMAKE_BINARY_DIR}/deb-packages-gen/${comp}/changelog.Debian.gz")
-    set(CHANGELOG_PACKAGE_NAME "${CPACK_DEBIAN_COMPONENT_${comp_upcase}_NAME}")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/changelog.Debian.in" "${DEBIAN_CHANGELOG_OUT_FILE}" @ONLY)
-
-    execute_process(COMMAND "${GZIP_TOOL}" "-cf9" "${DEBIAN_CHANGELOG_OUT_FILE}"
-                    OUTPUT_FILE "${DEBIAN_CHANGELOG_OUT_FILE_GZ}"
-                    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
-
-    install(FILES "${DEBIAN_CHANGELOG_OUT_FILE_GZ}"
-            DESTINATION "share/doc/${CPACK_DEBIAN_COMPONENT_${comp_upcase}_NAME}"
-            COMPONENT "${comp}")
-  endforeach()
-endif()
+if(NOT OPENCV_CUSTOM_PACKAGE_LAYOUT)
+  set(CPACK_libs_COMPONENT_INSTALL TRUE)
+  set(CPACK_dev_COMPONENT_INSTALL TRUE)
+  set(CPACK_docs_COMPONENT_INSTALL TRUE)
+  set(CPACK_python_COMPONENT_INSTALL TRUE)
+  set(CPACK_java_COMPONENT_INSTALL TRUE)
+  set(CPACK_samples_COMPONENT_INSTALL TRUE)
+endif(NOT OPENCV_CUSTOM_PACKAGE_LAYOUT)

 include(CPack)

-ENDif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+ENDif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
@@ -200,12 +200,12 @@ macro(OCV_OPTION variable description value)
    endif()
  endforeach()
  unset(__varname)
-  if(__condition STREQUAL "")
+  if("${__condition}" STREQUAL "")
    set(__condition 2 GREATER 1)
  endif()

  if(${__condition})
-    if(__value MATCHES ";")
+    if("${__value}" MATCHES ";")
      if(${__value})
        option(${variable} "${description}" ON)
      else()
@@ -152,14 +152,11 @@ ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
    OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on
 endif

-ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED),)
-    ifeq ($(OPENCV_USE_GPU_MODULE),on)
-        include $(CLEAR_VARS)
-        LOCAL_MODULE:=opencv_gpu
-        LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
-        include $(PREBUILT_STATIC_LIBRARY)
-    endif
-    OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED:=on
+ifeq ($(OPENCV_USE_GPU_MODULE),on)
+    include $(CLEAR_VARS)
+    LOCAL_MODULE:=opencv_gpu
+    LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
+    include $(PREBUILT_STATIC_LIBRARY)
 endif

 ifeq ($(OPENCV_LOCAL_CFLAGS),)
@@ -18,8 +18,8 @@
 #    This file will define the following variables:
 #      - OpenCV_LIBS                     : The list of all imported targets for OpenCV modules.
 #      - OpenCV_INCLUDE_DIRS             : The OpenCV include directories.
-#      - OpenCV_COMPUTE_CAPABILITIES     : The version of compute capability.
-#      - OpenCV_ANDROID_NATIVE_API_LEVEL : Minimum required level of Android API.
+#      - OpenCV_COMPUTE_CAPABILITIES     : The version of compute capability
+#      - OpenCV_ANDROID_NATIVE_API_LEVEL : Minimum required level of Android API
 #      - OpenCV_VERSION                  : The version of this OpenCV build: "@OPENCV_VERSION@"
 #      - OpenCV_VERSION_MAJOR            : Major version part of OpenCV_VERSION: "@OPENCV_VERSION_MAJOR@"
 #      - OpenCV_VERSION_MINOR            : Minor version part of OpenCV_VERSION: "@OPENCV_VERSION_MINOR@"
@@ -27,48 +27,22 @@
 #      - OpenCV_VERSION_TWEAK            : Tweak version part of OpenCV_VERSION: "@OPENCV_VERSION_TWEAK@"
 #
 #    Advanced variables:
-#      - OpenCV_SHARED                   : Use OpenCV as shared library
-#      - OpenCV_CONFIG_PATH              : Path to this OpenCVConfig.cmake
-#      - OpenCV_INSTALL_PATH             : OpenCV location (not set on Windows)
-#      - OpenCV_LIB_COMPONENTS           : Present OpenCV modules list
-#      - OpenCV_USE_MANGLED_PATHS        : Mangled OpenCV path flag
-#      - OpenCV_MODULES_SUFFIX           : The suffix for OpenCVModules-XXX.cmake file
-#      - OpenCV_HAVE_ANDROID_CAMERA      : Presence of Android native camera wrappers
+#      - OpenCV_SHARED
+#      - OpenCV_CONFIG_PATH
+#      - OpenCV_INSTALL_PATH  (not set on Windows)
+#      - OpenCV_LIB_COMPONENTS
+#      - OpenCV_USE_MANGLED_PATHS
+#      - OpenCV_HAVE_ANDROID_CAMERA
 #
 # ===================================================================================

-# Search packages for host system instead of packages for target system.
-# in case of cross compilation thess macro should be defined by toolchain file
-
-if(NOT COMMAND find_host_package)
-    macro(find_host_package)
-        find_package(${ARGN})
-    endmacro()
-endif()
-
-if(NOT COMMAND find_host_program)
-    macro(find_host_program)
-        find_program(${ARGN})
-    endmacro()
-endif()
-
-if(NOT DEFINED OpenCV_MODULES_SUFFIX)
-  if(ANDROID)
-    string(REPLACE - _ OpenCV_MODULES_SUFFIX "_${ANDROID_NDK_ABI_NAME}")
-  else()
-    set(OpenCV_MODULES_SUFFIX "")
-  endif()
+set(modules_file_suffix "")
+if(ANDROID)
+  string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}")
 endif()

 if(NOT TARGET opencv_core)
-  # Extract directory name from full path of the file currently being processed.
-  # Note that CMake 2.8.3 introduced CMAKE_CURRENT_LIST_DIR. We reimplement it
-  # for older versions of CMake to support these as well.
-  if(CMAKE_VERSION VERSION_LESS "2.8.3")
-    get_filename_component(CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-  endif()
-
-  include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${OpenCV_MODULES_SUFFIX}.cmake)
+  include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake)
 endif()

 # TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)
@@ -82,11 +56,7 @@ set(OpenCV_USE_CUFFT    @HAVE_CUFFT@)
 set(OpenCV_USE_NVCUVID  @HAVE_NVCUVID@)

 # Android API level from which OpenCV has been compiled is remembered
-if(ANDROID)
-  set(OpenCV_ANDROID_NATIVE_API_LEVEL @OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE@)
-else()
-  set(OpenCV_ANDROID_NATIVE_API_LEVEL 0)
-endif()
+set(OpenCV_ANDROID_NATIVE_API_LEVEL @OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE@)

 # Some additional settings are required if OpenCV is built as static libs
 set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
@@ -97,8 +67,8 @@ set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@)
 # Extract the directory where *this* file has been installed (determined at cmake run-time)
 get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)

-if(NOT WIN32 OR ANDROID)
-  if(ANDROID)
+if(NOT WIN32 OR OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0)
+  if(OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0)
    set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../../..")
  else()
    set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../..")
@@ -236,50 +206,41 @@ foreach(__opttype OPT DBG)
  SET(OpenCV_EXTRA_LIBS_${__opttype} "")

  # CUDA
-  if(OpenCV_CUDA_VERSION)
+  if(OpenCV_CUDA_VERSION AND (CMAKE_CROSSCOMPILING OR (WIN32 AND NOT OpenCV_SHARED)))
    if(NOT CUDA_FOUND)
-      find_host_package(CUDA ${OpenCV_CUDA_VERSION} EXACT REQUIRED)
+      find_package(CUDA ${OpenCV_CUDA_VERSION} EXACT REQUIRED)
    else()
      if(NOT CUDA_VERSION_STRING VERSION_EQUAL OpenCV_CUDA_VERSION)
        message(FATAL_ERROR "OpenCV static library was compiled with CUDA ${OpenCV_CUDA_VERSION} support. Please, use the same version or rebuild OpenCV with CUDA ${CUDA_VERSION_STRING}")
      endif()
    endif()

-    set(OpenCV_CUDA_LIBS_ABSPATH ${CUDA_LIBRARIES})
+    list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_LIBRARIES})

    if(${CUDA_VERSION} VERSION_LESS "5.5")
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_npp_LIBRARY})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_npp_LIBRARY})
    else()
      find_cuda_helper_libs(nppc)
      find_cuda_helper_libs(nppi)
      find_cuda_helper_libs(npps)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nppc_LIBRARY} ${CUDA_nppi_LIBRARY} ${CUDA_npps_LIBRARY})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nppc_LIBRARY} ${CUDA_nppi_LIBRARY} ${CUDA_npps_LIBRARY})
    endif()

    if(OpenCV_USE_CUBLAS)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_CUBLAS_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUBLAS_LIBRARIES})
    endif()

    if(OpenCV_USE_CUFFT)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_CUFFT_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUFFT_LIBRARIES})
    endif()

    if(OpenCV_USE_NVCUVID)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nvcuvid_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nvcuvid_LIBRARIES})
    endif()

    if(WIN32)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nvcuvenc_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nvcuvenc_LIBRARIES})
    endif()
-
-    set(OpenCV_CUDA_LIBS_RELPATH "")
-    foreach(l ${OpenCV_CUDA_LIBS_ABSPATH})
-      get_filename_component(_tmp ${l} PATH)
-      list(APPEND OpenCV_CUDA_LIBS_RELPATH ${_tmp})
-    endforeach()
-
-    list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH)
-    link_directories(${OpenCV_CUDA_LIBS_RELPATH})
  endif()
 endforeach()

@@ -1,4 +0,0 @@
-@CHANGELOG_PACKAGE_NAME@ (@CPACK_PACKAGE_VERSION@) unstable; urgency=low
-  * Debian changelog stub. See upstream changelog or release notes in user
-     documentation for more details.
- -- @CPACK_PACKAGE_CONTACT@  @CHANGELOG_PACKAGE_DATE@
@@ -161,6 +161,6 @@
 /* Xine video library */
 #cmakedefine HAVE_XINE

-/* Define if your processor stores words with the most significant byte
+/* Define to 1 if your processor stores words with the most significant byte
   first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN
@@ -18,14 +18,11 @@ if [ -z `which adb` ]; then
  return 1
 fi

-accuracy=`find "$OPENCV_TEST_PATH/$TARGET_ARCH" -maxdepth 1 -executable -name "opencv_test_*" -not -name opencv_test_ocl`
-performance=`find "$OPENCV_TEST_PATH/$TARGET_ARCH" -maxdepth 1 -executable -name "opencv_perf_*" -not -name opencv_perf_ocl`
-
 adb push $OPENCV_TEST_DATA_PATH /sdcard/opencv_testdata

 adb shell "mkdir -p /data/local/tmp/opencv_test"
 SUMMARY_STATUS=0
-for t in $accuracy $performance;
+for t in "$OPENCV_TEST_PATH/$TARGET_ARCH/"opencv_test_* "$OPENCV_TEST_PATH/$TARGET_ARCH/"opencv_perf_*;
 do
  test_name=`basename "$t"`
  report="$test_name-`date --rfc-3339=date`.xml"
@@ -1,142 +1,25 @@
-#!/bin/bash
-
-# Usage info
-
-usage()
-{
-cat << EOF
-usage: $0 [options]
-
-This script runs the OpenCV tests on linux device.
-
-OPTIONS:
-   -h           Show this message
-   -c           Color output
-EOF
-}
-
-# Parse options
-
-COLOR_OUTPUT=0
-while getopts “hc” OPTION
-do
-    case $OPTION in
-        h)
-            usage
-            exit 0
-            ;;
-        c)
-            COLOR_OUTPUT=1
-            ;;
-        ?)
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-# Text style
-
-if [ $COLOR_OUTPUT -eq 1 ]; then
-    TEXT_RED="$(tput setaf 1)"
-    TEXT_GREEN="$(tput setaf 2)"
-    TEXT_CYAN="$(tput setaf 6)"
-    TEXT_RESET="$(tput sgr0)"
-else
-    TEXT_RED=""
-    TEXT_GREEN=""
-    TEXT_CYAN=""
-    TEXT_RESET=""
-fi
-
-# Test binaries and data paths
+#!/bin/sh

 OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@
-OPENCV_PYTHON_TESTS=@OPENCV_PYTHON_TESTS_LIST@
 export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata

-# Run tests
-
 SUMMARY_STATUS=0
-FAILED_TESTS=""
-PASSED_TESTS=""
-
 for t in "$OPENCV_TEST_PATH/"opencv_test_* "$OPENCV_TEST_PATH/"opencv_perf_*;
 do
-    test_name=`basename "$t"`
-    report="$test_name-`date --rfc-3339=date`.xml"
-
-    cmd="$t --perf_min_samples=1 --perf_force_samples=1 --gtest_output=xml:\"$report\""
-
-    seg_reg="s/^/${TEXT_CYAN}[$test_name]${TEXT_RESET} /"                     # append test name
-    if [ $COLOR_OUTPUT -eq 1 ]; then
-        seg_reg="${seg_reg};s/\[==========\]/${TEXT_GREEN}&${TEXT_RESET}/g"   # green for [==========]
-        seg_reg="${seg_reg};s/\[----------\]/${TEXT_GREEN}&${TEXT_RESET}/g"   # green for [----------]
-        seg_reg="${seg_reg};s/\[ RUN      \]/${TEXT_GREEN}&${TEXT_RESET}/g"   # green for [ RUN      ]
-        seg_reg="${seg_reg};s/\[       OK \]/${TEXT_GREEN}&${TEXT_RESET}/g"   # green for [       OK ]
-        seg_reg="${seg_reg};s/\[  FAILED  \]/${TEXT_RED}&${TEXT_RESET}/g"     # red   for [  FAILED  ]
-        seg_reg="${seg_reg};s/\[  PASSED  \]/${TEXT_GREEN}&${TEXT_RESET}/g"   # green for [  PASSED  ]
-    fi
-
-    echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} RUN : $cmd"
-    $cmd | sed -r "$seg_reg"
-    ret=${PIPESTATUS[0]}
-    echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} RETURN_CODE : $ret"
-
-    if [ $ret -ne 0 ]; then
-        echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} ${TEXT_RED}FAILED${TEXT_RESET}"
-        SUMMARY_STATUS=1
-        FAILED_TESTS="$FAILED_TESTS $test_name"
-    else
-        echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} ${TEXT_GREEN}OK${TEXT_RESET}"
-        PASSED_TESTS="$PASSED_TESTS $test_name"
-    fi
-
-    echo ""
+  report="`basename "$t"`-`date --rfc-3339=date`.xml"
+  "$t" --perf_min_samples=1 --perf_force_samples=1 --gtest_output=xml:"$report"
+  TEST_STATUS=$?
+  if [ $TEST_STATUS -ne 0 ]; then
+    SUMMARY_STATUS=$TEST_STATUS
+  fi
 done

-for t in $OPENCV_PYTHON_TESTS;
-do
-    test_name=`basename "$t"`
-    report="$test_name-`date --rfc-3339=date`.xml"
-
-    cmd="py.test --junitxml $report \"$OPENCV_TEST_PATH\"/$t"
-
-    seg_reg="s/^/${TEXT_CYAN}[$test_name]${TEXT_RESET} /"                 # append test name
-
-    echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} RUN : $cmd"
-    eval "$cmd" | sed -r "$seg_reg"
-
-    ret=${PIPESTATUS[0]}
-    echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} RETURN_CODE : $ret"
-
-    if [ $ret -ne 0 ]; then
-        echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} ${TEXT_RED}FAILED${TEXT_RESET}"
-        SUMMARY_STATUS=1
-        FAILED_TESTS="$FAILED_TESTS $test_name"
-    else
-        echo "${TEXT_CYAN}[$test_name]${TEXT_RESET} ${TEXT_GREEN}OK${TEXT_RESET}"
-        PASSED_TESTS="$PASSED_TESTS $test_name"
-    fi
-
-    echo ""
-done
-
-# Remove temporary test files
-
 rm -f /tmp/__opencv_temp.*

-# Report final status
-
-echo "${TEXT_CYAN}===============================================================${TEXT_RESET}"
-echo "${TEXT_CYAN}PASSED TESTS : $PASSED_TESTS${TEXT_RESET}"
-echo "${TEXT_CYAN}FAILED TESTS : $FAILED_TESTS${TEXT_RESET}"
 if [ $SUMMARY_STATUS -eq 0 ]; then
-    echo "${TEXT_GREEN}STATUS : OK${TEXT_RESET}"
-    echo "${TEXT_GREEN}STATUS : All OpenCV tests finished successfully${TEXT_RESET}"
+  echo "All OpenCV tests finished successfully"
 else
-    echo "${TEXT_RED}STATUS : FAIL${TEXT_RESET}"
-    echo "${TEXT_RED}STATUS : OpenCV tests finished with status $SUMMARY_STATUS${TEXT_RESET}"
+  echo "OpenCV tests finished with status $SUMMARY_STATUS"
 fi

-exit $SUMMARY_STATUS
+return $SUMMARY_STATUS
@@ -1,74 +0,0 @@
-@echo OFF
-setlocal ENABLEDELAYEDEXPANSION
-
-rem Process command line
-
-rem This script is designed to allow situations when the tests are installed in
-rem a different directory from the library.
-
-set OPENCV_DIR=%~1
-
-if "%OPENCV_DIR%" == "" (
-	echo>&2 This script runs the OpenCV tests on Windows.
-	echo>&2
-    echo>&2 usage: %0 ^<OpenCV install directory^>
-	exit /B 1
-)
-
-if NOT EXIST "%OPENCV_DIR%" (
-    echo>&2 error: "%OPENCV_DIR%" doesn't exist
-)
-
-rem Set up paths
-
-set PATH=%OPENCV_DIR%\@OPENCV_BIN_INSTALL_PATH@;%PATH%
-set OPENCV_TEST_PATH=%~dp0
-set OPENCV_TEST_DATA_PATH=%OPENCV_TEST_PATH%\..\testdata
-
-rem Run tests
-
-set SUMMARY_STATUS=0
-set FAILED_TESTS=
-set PASSED_TESTS=
-
-for %%t IN ("%OPENCV_TEST_PATH%\opencv_test_*.exe" "%OPENCV_TEST_PATH%\opencv_perf_*.exe") DO (
-    set test_name=%%~nt
-    set report=!test_name!.xml
-
-    set cmd="%%t" --perf_min_samples=1 --perf_force_samples=1 "--gtest_output=xml:!report!"
-
-    echo [!test_name!] RUN : !cmd!
-    !cmd!
-    set ret=!errorlevel!
-    echo [!test_name!] RETURN_CODE : !ret!
-
-    if !ret! EQU 0 (
-        echo [!test_name!] OK
-        set PASSED_TESTS=!PASSED_TESTS! !test_name!
-    ) ELSE (
-        echo [!test_name!] FAILED
-        set SUMMARY_STATUS=1
-        set FAILED_TESTS=!FAILED_TESTS! !test_name!
-    )
-
-    echo.
-)
-
-rem Remove temporary test files
-
-del /F /Q "%TMP%\ocv*.tmp*"
-
-rem Report final status
-
-echo ===============================================================
-echo PASSED TESTS : %PASSED_TESTS%
-echo FAILED TESTS : %FAILED_TESTS%
-if %SUMMARY_STATUS% EQU 0 (
-    echo STATUS : OK
-    echo STATUS : All OpenCV tests finished successfully
-) ELSE (
-    echo STATUS : FAIL
-    echo STATUS : OpenCV tests finished with status %SUMMARY_STATUS%
-)
-
-exit /B %SUMMARY_STATUS%
@@ -0,0 +1,2 @@
+# Environment setup for OpenCV testing
+export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
@@ -4,7 +4,7 @@ file(GLOB LBP_CASCADES lbpcascades/*.xml)
 if(ANDROID)
  install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT libs)
  install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT libs)
-else()
+elseif(NOT WIN32)
  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT libs)
  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT libs)
 endif()
@@ -12,7 +12,7 @@ endif()
 if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
  if(ANDROID)
    install(DIRECTORY ${OPENCV_TEST_DATA_PATH} DESTINATION sdk/etc/testdata COMPONENT tests)
-  else()
+  elseif(NOT WIN32)
    # CPack does not set correct permissions by default, so we do it explicitly.
    install(DIRECTORY ${OPENCV_TEST_DATA_PATH}
            DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Smorkalov	b2790973a3	More accurate deb package build fix for CUDA 6.5 and newer.	2014-07-14 23:58:05 +04:00
Alexander Smorkalov	e650d87e47	Deb package build fix for CUDA 6.5 and newer.	2014-07-14 21:27:23 +04:00
Alexander Smorkalov	feb74b125d	Build fixes for CUDA 6.5 (cherry picked from commit `60a5ada454`)	2014-07-14 16:39:23 +04:00
Vladislav Vinogradov	b4845d8c9f	temporary disable performance test for alphaComp function(cherry picked from commit `1ce5165cb7`)	2014-02-14 17:12:31 +04:00
Alexander Smorkalov	ea51396731	Dead code removed as this cannot be null in Java. (cherry picked from commit `dbe7634286`)	2014-02-13 20:13:47 +04:00
Vladislav Vinogradov	aa82f921cc	temporary disable perf test for StereoBeliefPropagation(cherry picked from commit `eb247d826f`)	2014-02-13 20:13:38 +04:00
Vladislav Vinogradov	2da7eae2c4	increase epsilon for AlphaComp sanity test for integer input(cherry picked from commit `9e69e2a07a`)	2014-02-13 20:13:27 +04:00
Alexander Smorkalov	25159d8e81	Application pause/resume fix for Android sample NativeActivity. (cherry picked from commit `7da3e98dfd`)	2014-02-13 17:59:23 +04:00
Alexander Smorkalov	f40ffe4763	LICENSE and README files installation rules added. (cherry picked from commit `e55f2b2602`)	2014-02-12 19:36:52 +04:00
Alexander Smorkalov	116311b7b4	opencv_run_all_tests.sh implemented for Android SDK. (cherry picked from commit `d02c291160`)	2014-02-12 19:36:43 +04:00
Alexander Smorkalov	f1ef3a4865	OpenCV version++.	2014-02-11 10:15:02 +04:00
Vladislav Vinogradov	9997aa8187	decrease input size for several gpu tests to fix "timed out" error: * BruteForceNonLocalMeans * OpticalFlowBM(cherry picked from commit `8b44a42a40`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	f15b42018c	fix nonfree module compilation without CUDA(cherry picked from commit `3e1f74f2ca`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	f9e9ae85bd	dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a. (cherry picked from commit `b10d4b05ed`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	a49beb7c73	Multiple improvements in OpenCV examples build. EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project; INSTALL_CUDA_LIBRARIES option added to OpenCV.mk opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed; CUDA initialization apportunity added to OpenCVLoader.initDebug(); Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization. (cherry picked from commit `6ae4a9b09b`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	51dff5b9e8	project.properties file generation fixed for per-component installation. (cherry picked from commit `65b4d77959`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	826fc00374	Tests install path fix for Android SDK. (cherry picked from commit `0cd0e4749b`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	c10692deff	save previous values of LOCAL_* variables and restore them at the end(cherry picked from commit `286fe261d0`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	daa7b9ce5f	fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)(cherry picked from commit `a098fb1803`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	1ab02631b0	update stitching sample (cherry picked from commit `214cbabc40`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	3e755b2290	turn on CUDA part of stitching module on Android for non-dynamic build(cherry picked from commit `a138e5a6a5`)	2014-02-10 15:48:51 +04:00
Vladislav Vinogradov	f15a167df4	turn on CUDA part of nonfree module on Android for non-dynamic build(cherry picked from commit `d8f7377122`)	2014-02-10 15:48:51 +04:00
Ilya Lavrenov	f6367a2ea5	eliminated possible memory leak (cherry picked from commit `e7e63fac6c`)	2014-02-10 15:48:51 +04:00
Vladislav Vinogradov	5f88e2b496	fix #3477 : CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported by all VideoCapture backends. Some backends can return 0.0 or -1.0.(cherry picked from commit `c41e8006c7`)	2014-02-10 15:48:51 +04:00
Seunghoon Park	2c7cf52e3b	fixing bug #3345 . use norm to make sure two matrices are the same. (cherry picked from commit `eb9d7c4dd5`)	2014-02-10 15:48:51 +04:00
Andrey Pavlenko	b7c5083a87	removing duplicated legacy license, the actual instance is in 'opencv/LICENSE' (cherry picked from commit `dca5684145`)	2014-02-10 15:48:51 +04:00
Vladislav Vinogradov	d5d88efd5d	fix GpuMat::copyTo method with mask: fill destination matrix with zeros if it was reallocated(cherry picked from commit `dda999545c`)	2014-02-10 15:48:51 +04:00
Drew Jetter	6cb7a7be18	Fixed bug #3489 : The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent. (cherry picked from commit `6bf599b1bc`)	2014-02-10 15:48:51 +04:00
Pierre-Emmanuel Viel	cdea6b532f	Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified (cherry picked from commit `3f458c6eb1`)	2014-02-10 15:48:51 +04:00
ComFreek	d01e3529a6	Corrected package name in tutorial See also #2101(cherry picked from commit `ae795e5797`)	2014-02-10 15:48:51 +04:00
Nghia Ho	7c13d3277c	Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised. (cherry picked from commit `601b7d1dd3`)	2014-02-10 15:48:51 +04:00
Robbert Klarenbeek	345b3b0bdd	Fix algorithm setter argument validation for uchar(cherry picked from commit `e21c6e19db`)	2014-02-10 15:48:51 +04:00
Kazuki Matsuda	a65d7d4dd3	Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m) Fix compilation erros when compiling this constructor. First argument type of "convertTo" should be instance, not a pointer of instance. First pull request was created for master branch. But it should be marged for 2.4. https://github.com/Itseez/opencv/pull/2113 (cherry picked from commit `2ae20c74a2`)	2014-02-10 15:48:51 +04:00
Ilya Lavrenov	5e986f3347	fixed bug #3319 (cherry picked from commit `4f9c081dc3`)	2014-02-10 15:48:50 +04:00
Seunghoon Park	27a8bb471b	fixing bug #3345 . don't use BORDER_ISOLATED alone. it should be combined with some border type (cherry picked from commit `2272a58769`)	2014-02-10 15:48:50 +04:00
Seunghoon Park	7868733002	fixing bug #3345 (cherry picked from commit `b036fc756a`)	2014-02-10 15:48:50 +04:00
Ilya Lavrenov	469aef2e5e	fixed bug #3341 (cherry picked from commit `09d25e11c6`)	2014-02-10 15:48:50 +04:00
Roman Donchenko	5e00fc6afe	Fixed MinGW build by declaring the minimal required Windows version. Also deleted miscellaneous remaining multimon cruft. Deleted #include <winuser.h>, because <windows.h> includes it already. This should have a nice side effect of preventing us from accidentally using any Windows API that's too new. (cherry picked from commit `795c108f2b`)	2014-02-10 15:48:50 +04:00
Vladislav Vinogradov	5170f0b5da	fixed several bugs in CUDA Canny implementation: * out of border access in edgesHysteresisLocalKernel * incorrect usage of atomicAdd(cherry picked from commit `5dbdadb769`)	2014-02-07 20:59:13 +04:00
Vladislav Vinogradov	dc2dbb4173	Revert "disable gpu Canny and HoughCircles perf tests:" This reverts commit `dbce90692a`. (cherry picked from commit `bfc27271e2`)	2014-02-07 20:58:49 +04:00
Vladislav Vinogradov	79e4f7eb78	Revert "disable CUDA generalized Hough Transform" This reverts commit `33d42b740c`. (cherry picked from commit `5d099df578`)	2014-02-07 18:24:57 +04:00
Vladislav Vinogradov	cc73c7000f	fix epsilons for several gpu tests (cherry picked from commit `3e4bb371c8`)	2014-02-07 18:24:44 +04:00
Vladislav Vinogradov	8bb26fa5de	Revert "disable gpu CvtColor.*2HSV tests:" This reverts commit `952027a853`. (cherry picked from commit `b6ba1f226c`)	2014-02-07 18:24:35 +04:00
Vladislav Vinogradov	48612d7c58	Revert "disable gpu Subtract_Array test:" This reverts commit `e91bf95d58`. (cherry picked from commit `da44a2fac1`)	2014-02-07 18:24:23 +04:00
Alexander Smorkalov	8ba84f4b47	Implicit testdata directory permissions setup added. (cherry picked from commit `b86088b89c`)	2014-02-07 18:24:11 +04:00
Alexander Smorkalov	bc653add74	Absolute path to tests in opencv_run_app_tests.sh fixed. (cherry picked from commit `530702c5f2`)	2014-02-06 17:16:21 +04:00
Alexander Smorkalov	215f78eee2	Merge branch 'android_manager_version_inc4' into 2.4.8.1-prep	2014-01-31 22:25:36 +04:00
Vladislav Vinogradov	4425dac7f4	disable gpu CvtColor.*2HSV tests: possible bug in CPU version(cherry picked from commit 3cb8b352e52f85847d98d2b0ece32ba5bdb5c31b)	2014-01-31 22:24:20 +04:00
Vladislav Vinogradov	4f79b9de48	disable gpu Subtract_Array test: possible bug in CPU version(cherry picked from commit 59155c1eefb6f22e362e34a8d73b31841eb3413a)	2014-01-31 22:23:55 +04:00
Vladislav Vinogradov	397ac5e68f	disable gpu Canny and HoughCircles perf tests: it fails because driver terminates CUDA kernels after time out (cherry picked from commit fa5bbb5f8dc1a86cfe004fb258d66e56c90560d6)	2014-01-31 22:23:39 +04:00
Vladislav Vinogradov	43c75c64b5	disable NPP for GpuMat methods and for copyMakeBorder(cherry picked from commit 316d49fc0fb7a609ebb0a65efc207faea6b978a4)	2014-01-31 22:23:22 +04:00
Vladislav Vinogradov	c319625a07	disable some gpu tests if library was built without CUFFT(cherry picked from commit b4b929d27cc25822dd15b5b96b8d335c59d4408c)	2014-01-31 22:23:05 +04:00
Vladislav Vinogradov	a7d0448faa	gpu test output files moved from cwd to temp folder(cherry picked from commit `49731ad530`)	2014-01-31 22:22:49 +04:00
Alexander Smorkalov	ca10e5e8ae	Highgui test output fixes. Useless output to console fixed; Test output files moved from cwd to temp folder. (cherry picked from commit `87935f3560`)	2014-01-31 22:22:33 +04:00
Vladislav Vinogradov	32414afe72	disable performance test for gpu generalized hough(cherry picked from commit `063d8b4211`)	2014-01-31 22:22:14 +04:00
Alexander Smorkalov	ed10f50d25	Reports path fix for opencv_run_all_tests.sh.in script. (cherry picked from commit `3d261e8a01`)	2014-01-31 22:21:57 +04:00
Alexander Smorkalov	48d9be70d5	Android toolchain file sync with original project. Original project: https://github.com/taka-no-me/android-cmake/ Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a (cherry picked from commit `c815043607`)	2014-01-31 22:21:34 +04:00
Alexander Smorkalov	c6b31481b6	OpenCV Manager version++.	2014-01-31 12:15:22 +04:00
Alexander Smorkalov	514b714cc2	opencv_run_all_tests.sh script added to -tests package. (cherry picked from commit `d45350a06a`)	2014-01-29 17:41:59 +04:00
Alexander Smorkalov	7fec87d3f6	Multiple fixes for tests deb package build. Added opencv_testing.sh.in file; opencv_testing.sh installation guarded by OS check. (cherry picked from commit `d9dc5ffa91`)	2014-01-28 17:56:22 +04:00
Alexander Smorkalov	00d555f051	Code review notes fixed. Env setup for testing package implemented using /etc/profile.d; Variable with path for all native samples added; Path for test binaries and test data updated. (cherry picked from commit `39201e68e2`)	2014-01-27 21:37:01 +04:00
Alexander Smorkalov	6cf7d6ef4e	OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added. (cherry picked from commit `f332cba14b`)	2014-01-27 21:36:43 +04:00
Alexander Smorkalov	3ebdcafdd3	All installed files marked with component names for install customization. (cherry picked from commit `b75cbfde45`) Conflicts: cmake/OpenCVModule.cmake	2014-01-24 17:13:22 +04:00
Alexander Smorkalov	a348f3eeaa	OpenCV version++	2014-01-24 14:49:56 +04:00
Alexander Smorkalov	33f423de04	Improvements in package build. (cherry picked from commit `086792ec06`)	2014-01-24 14:48:51 +04:00
Alexander Smorkalov	d6ba52c3f9	Initial Linux packages build rools for CPack. (cherry picked from commit `7821fe2bde`) Conflicts: cmake/OpenCVModule.cmake	2014-01-24 14:48:19 +04:00
Vladislav Vinogradov	e9638d0997	disable CUDA generalized Hough Transform (cherry picked from commit `33d42b740c`)	2014-01-24 14:46:36 +04:00
Vladislav Vinogradov	5cb0084547	split CUDA Hough sources (cherry picked from commit `d847387694`)	2014-01-24 14:46:16 +04:00