mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 17:59:08 +08:00
eb044d1eb5
* [OpenCV] bump to 4.5.1 and to 3.4.13 * [OpenCV] fix patches * [OpenCV] fix hdf5 integration * [OpenCV] devendor quirc * fix quirc for downstream ports * [quirc] fix target export * update version refs * [OpenMVG] fix regressions with new opencv * update version refs * fix quirc mismatch * update version refs
95 lines
2.9 KiB
Diff
95 lines
2.9 KiB
Diff
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
index 2e4e4af..8cd9c75 100644
|
|
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
|
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
@@ -7,7 +7,7 @@ if(BUILD_ZLIB)
|
|
ocv_clear_vars(ZLIB_FOUND)
|
|
else()
|
|
ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
|
|
- 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)
|
|
@@ -33,7 +33,7 @@ if(WITH_JPEG)
|
|
ocv_clear_vars(JPEG_FOUND)
|
|
else()
|
|
ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR)
|
|
- include(FindJPEG)
|
|
+ find_package(JPEG REQUIRED)
|
|
endif()
|
|
|
|
if(NOT JPEG_FOUND)
|
|
@@ -79,7 +79,7 @@ if(WITH_TIFF)
|
|
ocv_clear_vars(TIFF_FOUND)
|
|
else()
|
|
ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR)
|
|
- 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()
|
|
@@ -123,7 +123,7 @@ if(WITH_WEBP)
|
|
ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
|
|
else()
|
|
ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR)
|
|
- include(cmake/OpenCVFindWebP.cmake)
|
|
+ find_package(WebP REQUIRED)
|
|
if(WEBP_FOUND)
|
|
set(HAVE_WEBP 1)
|
|
endif()
|
|
@@ -164,7 +164,7 @@ if(WITH_OPENJPEG)
|
|
if(BUILD_OPENJPEG)
|
|
ocv_clear_vars(OpenJPEG_FOUND)
|
|
else()
|
|
- find_package(OpenJPEG QUIET)
|
|
+ find_package(OpenJPEG REQUIRED)
|
|
endif()
|
|
|
|
if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION LESS 2)
|
|
@@ -192,7 +192,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG)
|
|
if(BUILD_JASPER)
|
|
ocv_clear_vars(JASPER_FOUND)
|
|
else()
|
|
- include(FindJasper)
|
|
+ find_package(Jasper REQUIRED)
|
|
endif()
|
|
|
|
if(NOT JASPER_FOUND)
|
|
@@ -217,7 +217,7 @@ if(WITH_PNG)
|
|
ocv_clear_vars(PNG_FOUND)
|
|
else()
|
|
ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR)
|
|
- 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)
|
|
@@ -249,7 +249,7 @@ if(WITH_OPENEXR)
|
|
ocv_clear_vars(HAVE_OPENEXR)
|
|
if(NOT BUILD_OPENEXR)
|
|
ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
|
|
- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
|
|
+ find_package(OpenEXR REQUIRED)
|
|
endif()
|
|
|
|
if(OPENEXR_FOUND)
|
|
@@ -267,7 +267,7 @@ endif()
|
|
|
|
# --- GDAL (optional) ---
|
|
if(WITH_GDAL)
|
|
- find_package(GDAL QUIET)
|
|
+ find_package(GDAL REQUIRED)
|
|
|
|
if(NOT GDAL_FOUND)
|
|
set(HAVE_GDAL NO)
|
|
@@ -279,7 +279,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)
|