mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 11:49:00 +08:00
f6601ee2e4
* Make gtk4.4 build. * Update baseline for gtk * Fix vcpkg version. * Fix vcpkg version. * [gtk] Fix macos build. * [gtk] Fix linux build. * [gtk] Add patches. * [gtk] Bump versions - again * Fix macos patch. * Bump versions. * [OpenCV] update to v4.5.4 and v3.4.16 * fix patches * [OpenCV] fix references * fix patches * update references * add gstreamer support * fix references * fixes * update references * Install xdamage. * Bump versions. * [fontconfig] disable doc building which is failing on bare linux * fix references * [opencv] use qt6 * [opencv2] use newer approach to downstream dependency handling * fix references * Add merged patch from upstream. * [gtk] Bump version. * [OpenCV] restore using qt5 * [opencv] force qt5 * update references * use a different strategy to find qt5 dependency for downstream projects * fix references * use a different strategy to find qt5 dependency for downstream projects also for opencv2 * fix references * [opencv2] fix patches * fix references * Update ports/fontconfig/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix references * fix references, again * add gtk to linux default features * fix references * [OpenCV2] fix cuda patch for newer cuda versions * fix references * [OpenCV2] add GTK feature * fix references * [opencv2] bump port version * [opencv2] fix references * Delete duplicate install of libxdamage-dev * [fontconfig] bump version * fix references * [fontconfig] bump version * fix references * move vcpkg-ci-opencv to manifest Co-authored-by: Berrysoft <Strawberry_Str@hotmail.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
|
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
@@ -6,7 +6,7 @@
|
|
if(BUILD_ZLIB)
|
|
ocv_clear_vars(ZLIB_FOUND)
|
|
else()
|
|
- include(FindZLIB)
|
|
+ find_package(ZLIB REQUIRED)
|
|
if(ZLIB_FOUND AND ANDROID)
|
|
if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
|
|
ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
|
|
@@ -32,7 +32,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()
|
|
@@ -74,7 +74,7 @@ if(WITH_JPEG)
|
|
if(BUILD_JPEG)
|
|
ocv_clear_vars(JPEG_FOUND)
|
|
else()
|
|
- include(FindJPEG)
|
|
+ find_package(JPEG REQUIRED)
|
|
endif()
|
|
|
|
if(NOT JPEG_FOUND)
|
|
@@ -95,7 +95,7 @@ if(WITH_JASPER)
|
|
if(BUILD_JASPER)
|
|
ocv_clear_vars(JASPER_FOUND)
|
|
else()
|
|
- include(FindJasper)
|
|
+ find_package(Jasper REQUIRED)
|
|
endif()
|
|
|
|
if(NOT JASPER_FOUND)
|
|
@@ -119,7 +119,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)
|
|
@@ -151,7 +151,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)
|