93 lines
2.9 KiB
Diff
93 lines
2.9 KiB
Diff
|
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
||
|
|
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
||
|
|
@@ -11,7 +11,7 @@ else()
|
||
|
|
set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||
|
|
set(CMAKE_FIND_LIBRARY_SUFFIXES .so)
|
||
|
|
endif()
|
||
|
|
- find_package(ZLIB "${MIN_VER_ZLIB}")
|
||
|
|
+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
|
||
|
|
if(ANDROID)
|
||
|
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|
||
|
|
unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
|
||
|
|
@@ -41,7 +41,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)
|
||
|
|
@@ -87,7 +87,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()
|
||
|
|
@@ -131,7 +131,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 NAMES WebP REQUIRED)
|
||
|
|
if(WEBP_FOUND)
|
||
|
|
set(HAVE_WEBP 1)
|
||
|
|
endif()
|
||
|
|
@@ -172,7 +172,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)
|
||
|
|
@@ -200,7 +200,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)
|
||
|
|
@@ -225,7 +225,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)
|
||
|
|
@@ -257,7 +257,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)
|
||
|
|
@@ -275,7 +275,7 @@ endif()
|
||
|
|
|
||
|
|
# --- GDAL (optional) ---
|
||
|
|
if(WITH_GDAL)
|
||
|
|
- find_package(GDAL QUIET)
|
||
|
|
+ find_package(GDAL REQUIRED)
|
||
|
|
|
||
|
|
if(NOT GDAL_FOUND)
|
||
|
|
set(HAVE_GDAL NO)
|
||
|
|
@@ -287,7 +287,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)
|