mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 18:29:01 +08:00
401578455f
* [OpenCV4] update to v4.5.5 * [OpenCV] bump version * [gstreamer] fix build for opencv * fix references * [vcpkg-tool-meson] fix nuget packaging * fix references * [gstreamer] fix references * [ogre] update vcpkg tools * fix references * [OpenCV4] fixes from CI runs * fix references * [OpenCV4] force python module also in debug builds * fix references * [harfbuzz] fix cmake config * harfbuzz fixes * fix references * [OpenCV4] remove unnecessary lines from patches * fix references * fix references * [harfbuzz] bump version * [harfbuzz] fix for single config builds * fix references * freetype fixes * fix references * fix ogre references * fix references, again * python when building static windows opencv libraries is unsupported * fix references * fix * refs * use required when necessary * fix references * do not use config for hdf5, use internal module * fix references * use proper spelling for freetype config cmake * fix references * [OpenCV] restore versions after merge * fix references * [leptonica] fix building * fix references * do not require package in optional features * £fix references * fix python feat * update version * update version * [ffmpeg] remove opengl feat on arm64-windows * format manifest * fix references * fix cuda/nvidia features compatibility matrix * fix manifest * fix * fix * fix references * fix references, again * move CONTROL to manifest * [gstreamer] bump versions * fix references Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -58,20 +58,19 @@ if(UNIX)
|
|
endif()
|
|
|
|
if(NOT SW_BUILD)
|
|
- find_package(GIF)
|
|
- find_package(JPEG)
|
|
- find_package(PNG)
|
|
- find_package(TIFF)
|
|
- find_package(ZLIB)
|
|
+ find_package(GIF REQUIRED)
|
|
+ find_package(JPEG REQUIRED)
|
|
+ find_package(PNG REQUIRED)
|
|
+ find_package(TIFF REQUIRED)
|
|
+ find_package(ZLIB REQUIRED)
|
|
find_package(PkgConfig)
|
|
+ find_package(OpenJPEG REQUIRED)
|
|
if (PKG_CONFIG_FOUND)
|
|
pkg_check_modules(WEBP libwebp QUIET)
|
|
pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET)
|
|
- pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)
|
|
endif()
|
|
if(NOT WEBP)
|
|
- find_path(WEBP_INCLUDE_DIR /webp/decode.h)
|
|
- find_library(WEBP_LIBRARY NAMES webp)
|
|
+ find_package(WebP CONFIG REQUIRED)
|
|
if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
|
|
set(WEBP 1)
|
|
set(WEBP_FOUND TRUE)
|
|
@@ -213,7 +212,7 @@ include(Configure)
|
|
|
|
configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY)
|
|
|
|
-set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica")
|
|
+set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica")
|
|
|
|
###############################################################################
|
|
#
|