Merge pull request #14 from Ubiquite/hunter-3.2.0

Hunterized 3.2.0

3rdparty/ippicv/downloader.cmake

@@ -59,6 +59,11 @@ function(_icv_downloader)
     endif()
   endif()
 
+  if(HUNTER_ENABLED)
+    hunter_add_package(ippicv)
+    set(OPENCV_ICV_URL "file://${IPPICV_ROOT}")
+  endif()
+
   if(NOT EXISTS "${OPENCV_ICV_PACKAGE_ARCHIVE}")
     if(NOT DEFINED OPENCV_ICV_URL)
       if(DEFINED ENV{OPENCV_ICV_URL})

CMakeLists.txt

@@ -93,10 +93,19 @@ if(DEFINED CMAKE_BUILD_TYPE)
   set_property( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
 endif()
 
-enable_testing()
+include("cmake/HunterGate.cmake")
+HunterGate(
+    URL "https://github.com/ruslo/hunter/archive/v0.17.7.tar.gz"
+    SHA1 "78219f42c3737adcc161c52b9f71ce65a3d775c2"
+)
 
 project(OpenCV CXX C)
 
+if(IOS)
+  set(CMAKE_SYSTEM_PROCESSOR "")
+  set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -fomit-frame-pointer -ffast-math")
+endif()
+
 if(MSVC)
   set(CMAKE_USE_RELATIVE_PATHS ON CACHE INTERNAL "" FORCE)
 endif()
@@ -461,6 +470,10 @@ ocv_include_directories(${OPENCV_CONFIG_FILE_INCLUDE_DIR})
 #  Path for additional modules
 # ----------------------------------------------------------------------------
 set(OPENCV_EXTRA_MODULES_PATH "" CACHE PATH "Where to look for additional OpenCV modules")
+if(OPENCV_WITH_EXTRA_MODULES)
+  hunter_add_package(OpenCV-Extra)
+  set(OPENCV_EXTRA_MODULES_PATH "${OPENCV-EXTRA_ROOT}/modules")
+endif()
 
 # ----------------------------------------------------------------------------
 #  Autodetect if we are in a GIT repository