mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 07:57:55 +08:00
f1e7a3f167
* [opencv4] draft update to v4.3 * restore uwp patch * fix qt and ipp features * fix libepoxy and meson on osx * fix baseline, trigger a full rebuild due to meson tool changes * remove jpeg feature on windows due to a bug with MSVC * minor fixes for some features * ffmpeg x11 lib not required anymore on apple for downstream projects * small fixes for ogre and qt5 * remove a broken module * fix installation path * fix openexr which was broken and regressed opencv downstream projects * first round of ci passes * improve compatibility with android toolchain * [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR * fix OpenEXR link for downstream projects * do not install unrequested features * fix compatibility with newer OpenEXR * [OpenCV3] update to v3.4.10 * fix openexr on windows, was creating symlinks that broke vcpkg * fix openexr wrapper * [openexr] cmake config files are installed into a lowered-case folder * remove mangled paths trying to fix android setup * disable dnn on android, fix mangled cmake config paths again * fix downstream CUDA dependency * fix compatibility with vs16.6 * remove from baseline ports now passing tests * [alembic] fixes for new openexr * fix baseline * [field3d] fixes for new openexr * [field3d] improve fixes, windows still unsupported despite what is said upstream * apply fixes required from review * add missing field3d patch * [field3d] disable mpi integration * [opencv2] remove cublas integration * [vtk] do not create libharu::libharu target if already existing * Update ports/opencv4/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/opencv3/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * improve compatibility with newer CUDNN * [OpenCV3, OpenCV4] improve compatibility with CUDA 11 * [OpenCV2] improve compatibility with CUDA 11 * [field3d] regenerate patch ignoring space at eol * [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999) * [field3d] regenerate patch ignoring space at eol * [field3d] regenerate patch, again * [field3d] fixes for windows * [libass] fix regression * ci.baseline.txt update * [CUDA11] use FindCUDA from CMake 3.18 to ease transition later * re-bump vtk and ffmpeg, which were lost with merges from master * [OpenCV4] Halide feature is not broken anymore * [field3d] regenerate hdf5 patch * [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems... * merge ci.baseline.txt from master and fix field3d patch * remove rebuilding * restore vtk CONTROL file * update CONTROL files * Trigger rebuild * Update ports/freeimage/CONTROL * Update ports/freeimage/CONTROL * [opencv3/4] avoid tesseract dependency on uwp builds * [opencv] add missing module search Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
122 lines
3.5 KiB
Diff
122 lines
3.5 KiB
Diff
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
index 0beaf19..3ba1ebd 100644
|
|
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
|
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
@@ -6,7 +6,7 @@
|
|
if(BUILD_ZLIB)
|
|
ocv_clear_vars(ZLIB_FOUND)
|
|
else()
|
|
- 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)
|
|
@@ -30,7 +30,7 @@ if(WITH_JPEG)
|
|
if(BUILD_JPEG)
|
|
ocv_clear_vars(JPEG_FOUND)
|
|
else()
|
|
- include(FindJPEG)
|
|
+ find_package(JPEG REQUIRED)
|
|
endif()
|
|
|
|
if(NOT JPEG_FOUND)
|
|
@@ -74,7 +74,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()
|
|
@@ -117,7 +117,7 @@ if(WITH_WEBP)
|
|
if(BUILD_WEBP)
|
|
ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
|
|
else()
|
|
- include(cmake/OpenCVFindWebP.cmake)
|
|
+ find_package(WebP REQUIRED)
|
|
if(WEBP_FOUND)
|
|
set(HAVE_WEBP 1)
|
|
endif()
|
|
@@ -173,7 +173,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)
|
|
@@ -197,7 +197,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)
|
|
@@ -228,7 +228,7 @@ endif()
|
|
if(WITH_OPENEXR)
|
|
ocv_clear_vars(HAVE_OPENEXR)
|
|
if(NOT BUILD_OPENEXR)
|
|
- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
|
|
+ find_package(OpenEXR REQUIRED)
|
|
endif()
|
|
|
|
if(OPENEXR_FOUND)
|
|
@@ -246,7 +246,7 @@ endif()
|
|
|
|
# --- GDAL (optional) ---
|
|
if(WITH_GDAL)
|
|
- find_package(GDAL QUIET)
|
|
+ find_package(GDAL REQUIRED)
|
|
|
|
if(NOT GDAL_FOUND)
|
|
set(HAVE_GDAL NO)
|
|
@@ -258,7 +258,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)
|
|
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
|
|
index b9b1a95..596c152 100644
|
|
--- a/cmake/OpenCVFindLibsPerf.cmake
|
|
+++ b/cmake/OpenCVFindLibsPerf.cmake
|
|
@@ -51,14 +51,9 @@ endif(WITH_CUDA)
|
|
|
|
# --- Eigen ---
|
|
if(WITH_EIGEN AND NOT HAVE_EIGEN)
|
|
- find_package(Eigen3 QUIET)
|
|
+ find_package(Eigen3 REQUIRED)
|
|
|
|
if(Eigen3_FOUND)
|
|
- if(TARGET Eigen3::Eigen)
|
|
- # Use Eigen3 imported target if possible
|
|
- list(APPEND OPENCV_LINKER_LIBS Eigen3::Eigen)
|
|
- set(HAVE_EIGEN 1)
|
|
- else()
|
|
if(DEFINED EIGEN3_INCLUDE_DIRS)
|
|
set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS})
|
|
set(HAVE_EIGEN 1)
|
|
@@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
|
|
set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR})
|
|
set(HAVE_EIGEN 1)
|
|
endif()
|
|
- endif()
|
|
if(HAVE_EIGEN)
|
|
if(DEFINED EIGEN3_WORLD_VERSION) # CMake module
|
|
set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION})
|
|
@@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
|
|
set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR})
|
|
set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH})
|
|
endif()
|
|
+ ocv_include_directories(${EIGEN_INCLUDE_PATH})
|
|
endif()
|
|
endif()
|
|
|