mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-20 18:15:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
b7f99c3c4b
vcpkg/ports/field3d/0003_hdf5_api.patch

13 lines
335 B
Diff
Raw Normal View History

[hdf5] Update HDF5 to 1.12 (#11747) * [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download * [hdf5] bump control * [hdf5] fix szip and typo about linkage * [hdf5] add missing package namespace.... they somehow missed to set it? * [hdf5] retry without " * [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows * fix typo * remove ws Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * linebreak first patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * ws change Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [field3d] update copying installation * [hdf5] use official github repo * clean baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-06-24 03:58:50 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
[opencv4] update to v4.3 (#11130) * [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>
2020-07-28 08:43:23 +08:00
index b57057f..e809880 100644
--- a/CMakeLists.txt
[hdf5] Update HDF5 to 1.12 (#11747) * [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download * [hdf5] bump control * [hdf5] fix szip and typo about linkage * [hdf5] add missing package namespace.... they somehow missed to set it? * [hdf5] retry without " * [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows * fix typo * remove ws Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * linebreak first patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * ws change Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [field3d] update copying installation * [hdf5] use official github repo * clean baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-06-24 03:58:50 +08:00
+++ b/CMakeLists.txt
[qt5-base] Add zstd as a dependency (#12342) * [qt5-base] add hidden optional not switchable zstd dependency. * [netcdf/paraview] correct embree3 dependency [paraview] make tools default feature for CI testing. * [paraview] fix typo and remove unnecessary flags * [paraview] add flags back into portfile * [vtk] add hdf5 api patch [paraview] remove hdf5 use flags from portfile [field3d] use flags instead of patching to fix hdf5. * [paraview] remove message on osx since it now works with qt 5.15 * [paraview] remove default feature and force CI features by a CI test port * [paraview|CI] back out python from CI testing for now * [qt5-base] add in the macos deployment target fix
2020-08-02 04:48:24 +08:00
@@ -35,6 +35,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.17 )
[hdf5] Update HDF5 to 1.12 (#11747) * [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download * [hdf5] bump control * [hdf5] fix szip and typo about linkage * [hdf5] add missing package namespace.... they somehow missed to set it? * [hdf5] retry without " * [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows * fix typo * remove ws Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * linebreak first patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * ws change Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [field3d] update copying installation * [hdf5] use official github repo * clean baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-06-24 03:58:50 +08:00
PROJECT ( field3d )
[opencv4] update to v4.3 (#11130) * [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>
2020-07-28 08:43:23 +08:00
[qt5-base] Add zstd as a dependency (#12342) * [qt5-base] add hidden optional not switchable zstd dependency. * [netcdf/paraview] correct embree3 dependency [paraview] make tools default feature for CI testing. * [paraview] fix typo and remove unnecessary flags * [paraview] add flags back into portfile * [vtk] add hdf5 api patch [paraview] remove hdf5 use flags from portfile [field3d] use flags instead of patching to fix hdf5. * [paraview] remove message on osx since it now works with qt 5.15 * [paraview] remove default feature and force CI features by a CI test port * [paraview|CI] back out python from CI testing for now * [qt5-base] add in the macos deployment target fix
2020-08-02 04:48:24 +08:00
+add_definitions(-DH5_USE_110_API)
[hdf5] Update HDF5 to 1.12 (#11747) * [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download * [hdf5] bump control * [hdf5] fix szip and typo about linkage * [hdf5] add missing package namespace.... they somehow missed to set it? * [hdf5] retry without " * [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows * fix typo * remove ws Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * linebreak first patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * ws change Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [field3d] update copying installation * [hdf5] use official github repo * clean baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-06-24 03:58:50 +08:00
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )
FIND_PACKAGE (Doxygen)
Reference in New Issue Copy Permalink