Merge pull request #10 from elucideye/opencv-3.0.0-p7

Opencv 3.0.0 p7
elucideye · Oct 29, 2016 · 284944f · 284944f
2 parents d44174a + 5b5f195
commit 284944f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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/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"