1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -16,6 +16,7 @@ if(WITH_ZLIB_NG)
set(HAVE_ZLIB_NG YES)
else()
+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
if(BUILD_ZLIB)
ocv_clear_vars(ZLIB_FOUND)
else()
@@ -28,8 +29,6 @@ else()
set(ZLIB_FOUND TRUE)
set(ZLIB_LIBRARY z)
set(ZLIB_LIBRARIES z)
- else()
- find_package(ZLIB "${MIN_VER_ZLIB}")
endif()
if(ANDROID)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
@@ -61,7 +60,7 @@ endif()
if(WITH_AVIF)
ocv_clear_internal_cache_vars(AVIF_LIBRARY AVIF_INCLUDE_DIR)
- include(cmake/OpenCVFindAVIF.cmake)
+ find_package(libavif REQUIRED)
if(AVIF_FOUND)
set(HAVE_AVIF 1)
endif()
@@ -78,7 +77,7 @@ if(WITH_JPEG)
set(JPEG_LIBRARIES jpeg)
set(JPEG_FOUND TRUE)
else()
- include(FindJPEG)
+ find_package(JPEG REQUIRED)
endif()
endif()
@@ -130,7 +129,7 @@ if(WITH_TIFF)
set(TIFF_LIBRARIES tiff)
set(TIFF_FOUND TRUE)
else()
- include(FindTIFF)
+ find_package(TIFF REQUIRED)
endif()
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)
@@ -175,7 +174,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()
@@ -234,6 +233,8 @@ if(WITH_JPEGXL)
if(JPEGXL_FOUND)
set(HAVE_JPEGXL YES)
message(STATUS "Found system JPEG-XL: ver ${JPEGXL_VERSION}")
+ else()
+ message(FATAL_ERROR "JPEG-XL is required but not found. Please install it.")
endif()
endif()
@@ -242,7 +243,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)
@@ -271,7 +272,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)
@@ -297,9 +298,9 @@ if(WITH_SPNG)
# CMakeConfig bug in SPNG, include is missing there in version 0.7.4 and older
# See https://github.com/randy408/libspng/pull/264
include(CMakeFindDependencyMacro)
- find_package(SPNG QUIET)
+ find_package(SPNG REQUIRED)
if(SPNG_FOUND)
- set(SPNG_LIBRARY "spng::spng" CACHE INTERNAL "")
+ set(SPNG_LIBRARY "$<IF:$<TARGET_EXISTS:spng::spng>,spng::spng,spng::spng_static>" CACHE INTERNAL "")
set(SPNG_LIBRARIES ${SPNG_LIBRARY})
else()
if(PkgConfig_FOUND)
@@ -331,7 +332,7 @@ if(NOT HAVE_SPNG AND WITH_PNG)
ocv_clear_vars(PNG_FOUND)
else()
ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR)
- find_package(PNG QUIET)
+ find_package(PNG REQUIRED)
endif()
if(NOT PNG_FOUND)
@@ -354,7 +355,8 @@ 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 CONFIG REQUIRED)
+ set(OPENEXR_FOUND TRUE)
endif()
if(OPENEXR_FOUND)
@@ -374,7 +376,7 @@ endif()
# --- GDAL (optional) ---
if(WITH_GDAL)
- find_package(GDAL QUIET)
+ find_package(GDAL REQUIRED)
if(NOT GDAL_FOUND)
set(HAVE_GDAL NO)
@@ -386,7 +388,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)
--- a/modules/imgcodecs/CMakeLists.txt
+++ b/modules/imgcodecs/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
if(HAVE_WEBP)
add_definitions(-DHAVE_WEBP)
- ocv_include_directories(${WEBP_INCLUDE_DIR})
+ ocv_include_directories(${WEBP_INCLUDE_DIRS})
list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES})
endif()
|
