mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 10:59:07 +08:00
4fb51523e9
* [OpenCV] update to v4 * [OpenCV] update to v4.1 * [OpenCV] merge #6901 and #6812 * [OpenCV] port patches to v4.1 * [OpenCV] fix naming * [OpenCV] fix regression with static linkage * [OpenCV] fix linking to optional feature dependencies in static mode * fix ffmpeg on some architectures * trigger rebuild of regressions on macOS * [zxing-cpp] fix opencv 4.1 compat * [ogre] improve patching for static builds * [OpenCV] fixes for extra features * [OpenCV] drastically reduce patchset * [OpenCV] fix regression on linux * [OpenCV] fix regression on Windows * [qt5] depends on qt5-activeqt only on windows * update to v4.1.1 * [OpenCV] additional fixes for 4.1.1 * [OpenCV] fix Eigen3 feature integration * [opencv] Fix compilation in UWP * [opencv] Fix merge conflicts * [ffmpeg] fix cmake module for osx * [OpenCV] add pre-caching of optflow cuda package * [gdcm] properly fix #6863 instead of wrong #6901 * [OpenCV] fix OpenMP feature * [opencv] Add missing GetModuleHandle() call guard for UWP * [freeimage] Do not depend on libwebp[all] on UWP * [opencv] Set app container bit for UWP * [zxing-cpp] Fail with explicit message in UWP * [pthreads4w] fix target creation, missing dlls * [pthreads4w] bump CONTROL * [opencv,zxing-cpp] Fix OpenCV Video IO module * [zxing-cpp] Revert unnecessary changes * [opencv] Feature halide * Fix regression in UWP * [ffmpeg] remove unnecessary patch pointing to old OpenCV version * [opencv] remove versioning from windows dll filenames * [opencv] Move port to opencv4 * [opencv,opencv4] Make meta-package install OpenCV 4.1 * [opencv3] Rename old port opencv->opencv3 * Add failure messages when another OpenCV is already installed
84 lines
2.2 KiB
Diff
84 lines
2.2 KiB
Diff
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
|
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
@@ -6,7 +6,7 @@
|
|
if(BUILD_ZLIB)
|
|
ocv_clear_vars(ZLIB_FOUND)
|
|
else()
|
|
- find_package(ZLIB "${MIN_VER_ZLIB}")
|
|
+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
|
|
if(ZLIB_FOUND AND ANDROID)
|
|
if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$")
|
|
set(ZLIB_LIBRARIES z)
|
|
@@ -30,7 +30,7 @@ if(WITH_JPEG)
|
|
if(BUILD_JPEG)
|
|
ocv_clear_vars(JPEG_FOUND)
|
|
else()
|
|
- include(FindJPEG)
|
|
+ find_package(JPEG REQUIRED)
|
|
endif()
|
|
|
|
if(NOT JPEG_FOUND)
|
|
@@ -51,7 +51,7 @@ if(WITH_TIFF)
|
|
if(BUILD_TIFF)
|
|
ocv_clear_vars(TIFF_FOUND)
|
|
else()
|
|
- include(FindTIFF)
|
|
+ find_package(TIFF REQUIRED)
|
|
if(TIFF_FOUND)
|
|
ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
|
|
endif()
|
|
@@ -94,7 +94,7 @@ if(WITH_WEBP)
|
|
if(BUILD_WEBP)
|
|
ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
|
|
else()
|
|
- include(cmake/OpenCVFindWebP.cmake)
|
|
+ find_package(WebP REQUIRED)
|
|
if(WEBP_FOUND)
|
|
set(HAVE_WEBP 1)
|
|
endif()
|
|
@@ -135,7 +135,7 @@ if(WITH_JASPER)
|
|
if(BUILD_JASPER)
|
|
ocv_clear_vars(JASPER_FOUND)
|
|
else()
|
|
- include(FindJasper)
|
|
+ find_package(Jasper REQUIRED)
|
|
endif()
|
|
|
|
if(NOT JASPER_FOUND)
|
|
@@ -159,7 +159,7 @@ if(WITH_PNG)
|
|
if(BUILD_PNG)
|
|
ocv_clear_vars(PNG_FOUND)
|
|
else()
|
|
- include(FindPNG)
|
|
+ find_package(PNG REQUIRED)
|
|
if(PNG_FOUND)
|
|
include(CheckIncludeFile)
|
|
check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
|
|
@@ -191,7 +191,7 @@ if(WITH_OPENEXR)
|
|
if(BUILD_OPENEXR)
|
|
ocv_clear_vars(OPENEXR_FOUND)
|
|
else()
|
|
- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
|
|
+ find_package(OpenEXR REQUIRED)
|
|
endif()
|
|
|
|
if(NOT OPENEXR_FOUND)
|
|
@@ -207,7 +207,7 @@ endif()
|
|
|
|
# --- GDAL (optional) ---
|
|
if(WITH_GDAL)
|
|
- find_package(GDAL QUIET)
|
|
+ find_package(GDAL REQUIRED)
|
|
|
|
if(NOT GDAL_FOUND)
|
|
set(HAVE_GDAL NO)
|
|
@@ -219,7 +219,7 @@ if(WITH_GDAL)
|
|
endif()
|
|
|
|
if (WITH_GDCM)
|
|
- find_package(GDCM QUIET)
|
|
+ find_package(GDCM REQUIRED)
|
|
if(NOT GDCM_FOUND)
|
|
set(HAVE_GDCM NO)
|
|
ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
|