From 7ba33e78c80f02293b139c2af3a0224b63256974 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 28 Oct 2016 15:55:30 -0400 Subject: [PATCH 1/3] opencv 3.0.0-p7 (not yet in hunter), WITH_QTKIT=NO for osx --- cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake | 2 ++ config.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake b/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake index b7d3661..28b16d1 100644 --- a/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake +++ b/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake @@ -29,6 +29,8 @@ macro(drishti_set_opencv_cmake_args_osx) HAVE_CUBLAS=NO HAVE_CUDA=NO + WITH_QTKIT=NO + WITH_PTHREADS_PF=OFF # "Use pthreads-based parallel_for" WITH_TBB=OFF # "Include Intel TBB support" WITH_1394=OFF # "Include IEEE1394 support" diff --git a/config.cmake b/config.cmake index 5977b33..9ed23e0 100644 --- a/config.cmake +++ b/config.cmake @@ -42,7 +42,7 @@ list(APPEND OPENCV_CMAKE_ARGS BUILD_EIGEN=OFF ### for convenient linking ) -hunter_config(OpenCV VERSION 3.0.0-p6 CMAKE_ARGS "${OPENCV_CMAKE_ARGS}") +hunter_config(OpenCV VERSION 3.0.0-p7 CMAKE_ARGS "${OPENCV_CMAKE_ARGS}") ### Boost hunter_config(Boost VERSION 1.58.0-p1 CMAKE_ARGS IOSTREAMS_NO_BZIP2=1 ) From eda6204ceb08f9e534d51b011c759f2a226f28f4 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Sat, 29 Oct 2016 09:11:41 -0400 Subject: [PATCH 2/3] update hunter to 0.16.21 (opencv-3.0.0-p7) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b85d517..0367966 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ include("cmake/HunterGate.cmake") list(APPEND HUNTER_CACHE_SERVERS "https://github.com/elucideye/hunter-cache") HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.16.20.tar.gz" - SHA1 "fedccd8d37364b0593c9b87d4d3ea41d51be3a9f" + URL "https://github.com/ruslo/hunter/archive/v0.16.21.tar.gz" + SHA1 "9fc322a343686de97e32feb4b7445133253ee321" FILEPATH "${CMAKE_CURRENT_LIST_DIR}/config.cmake" ) From 996bfecceddd5680a12f04222e2fdb8b5fa28b77 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Sat, 29 Oct 2016 09:12:23 -0400 Subject: [PATCH 3/3] exclude unused TIFF and JPEG from platform builds --- cmake/Modules/drishti_set_opencv_cmake_args_nix.cmake | 2 +- cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake | 4 ++-- cmake/Modules/drishti_set_opencv_cmake_args_windows.cmake | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/drishti_set_opencv_cmake_args_nix.cmake b/cmake/Modules/drishti_set_opencv_cmake_args_nix.cmake index 50120fb..19b8cb3 100644 --- a/cmake/Modules/drishti_set_opencv_cmake_args_nix.cmake +++ b/cmake/Modules/drishti_set_opencv_cmake_args_nix.cmake @@ -19,7 +19,7 @@ macro(drishti_set_opencv_cmake_args_nix) ### Custom ARGS ### WITH_PNG=ON # "Include PNG support" - WITH_TIFF=ON # "Include TIFF support" + WITH_TIFF=OFF # "Include TIFF support" WITH_JASPER=ON # "Include JPEG2K support" WITH_JPEG=OFF # "Include JPEG support" WITH_TBB=ON # "Include Intel TBB support" diff --git a/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake b/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake index 28b16d1..98e31e7 100644 --- a/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake +++ b/cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake @@ -17,9 +17,9 @@ macro(drishti_set_opencv_cmake_args_osx) ### Custom ARGS ### WITH_PNG=ON # "Include PNG support" - WITH_TIFF=ON # "Include TIFF support" + WITH_TIFF=OFF # "Include TIFF support" WITH_JASPER=ON # "Include JPEG2K support" - WITH_JPEG=OFF # "Include JPEG support" + WITH_JPEG=OFF # "Include JPEG support" BUILD_JPEG=OFF WITH_OPENCL=NO diff --git a/cmake/Modules/drishti_set_opencv_cmake_args_windows.cmake b/cmake/Modules/drishti_set_opencv_cmake_args_windows.cmake index c3058e9..edc23bb 100644 --- a/cmake/Modules/drishti_set_opencv_cmake_args_windows.cmake +++ b/cmake/Modules/drishti_set_opencv_cmake_args_windows.cmake @@ -17,7 +17,7 @@ macro(drishti_set_opencv_cmake_args_windows) ### Custom ARGS ### WITH_PNG=ON # "Include PNG support" - WITH_TIFF=ON # "Include TIFF support" + WITH_TIFF=OFF # "Include TIFF support" WITH_JASPER=ON # "Include JPEG2K support" WITH_JPEG=OFF # "Include JPEG support" WITH_TBB=ON # "Include Intel TBB support"