incorporate changes from microsoft:master #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
) * [vcpkg/scripts/pkgconfig] rewrite pkgconfig check for libraries. * [vcpkg/scripts/pkgconfig] fix more details. * [vcpkg/scripts/pkgconfig] smaller improvements * ws change to check functionallity of script for testing. * [vcpkg/scripts/pkgconfig] update to latest test version * Revert "ws change to check functionallity of script for testing." This reverts commit 26269e9. * [nettle] bump control for vcpkg_fixup_pkgconfig test * [gmp] rerun CI to create new *.pc files * [gmp/nettle] enable port debug * [vcpkg/script/pkgconfig] fix path conversion regex for CI * [CI|OSX] install pkg-config on osx * [gmp/nettle] disable port debug * [vcpkg/scripts/pkgconfig] update to latest version of x windows pr * [zlib] add pkgconfig file * [zstd] add fixup pkgconfig * [libpng] add pc file installation * [bzip2] install pc file and leave a TODO for somebody else ;) * [bzip2] bump control * [vcpkg/scripts/pkgconfig] skip checks if pkgconfig cannot be found. - small bugfix in ignore flags regex * retry zstd and zlib * [libpng] retry by adding dl and m to system libraries for osx * [libpng] add missing vcpkg_fixup_pkgconfig() * [vcpkg/scripts/pkgconfig] unset var if found. fixes checks for other configurations which will be always succesful otherwise * [libpng] bump control * [libpng] enable port debug to debug osx regression * ws change to retrigger osx ci and hopeing that it works * fix typo * [libpng] remove -lm flag on apple platforms * ws change to rerun some ports in ci for good measure after the merge with master * Re-trigger CI test * [zstd] add pkgconfig * [zstd] correct debug link * [vcpkg/script/pkgconfig] - add more search suffixes for static libs - add additional debug messages for debuging - fix unsetting of cache variables hiding issues with debug libraries - fixed pkgconfig fix in the debug case * [pcre] add pthread dependency to pcre * [protobuf] fix pkgconfig * include quotes around the prefix in the case the prefix path was quoted (fixes some regressions) add option NOT_STATIC_PKGCONFIG to run pkg-config without the --static argument * [ignition-msgs5] get rid of a dev warning * [apr] fix apr regression * [protobuf] fix protobuf regression * [sdl1] fix regression due to variable expansion of pkg-config. Use similar regex to the library removal for ignored flags. * [ignition] fix regression * remove changes of zlib portfile. * reset changes in osx ci pipeline * add DISABLE_PARALLEL_CONFIGURE Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
* [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>
* Azure-IoT-Sdk for C release 2020-07-19 * Update ports/azure-c-shared-utility/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/azure-iot-sdk-c/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/azure-uamqp-c/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/azure-macro-utils-c/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/azure-umqtt-c/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/azure-uhttp-c/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/umock-c/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Do not update azure-macro-utils-c and umock-c for release 2020-07-19 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [semver] Add new port * [neargye-semver] Changed port name to a more specific neargye-semver. - Also moved the header file into a subdirectory.
* [libusb] support linux * Add Supports * Using vcpkg_configure_make instead * Revert to install headers in windows * Fix failures in libftd1 * Update treehopper * Add failed ports in ci baseline file * Revert to remove azure-kinect-sensor-sdk:x64-windows-static=fail in baseline file * Resolve conflicts Co-authored-by: PhoebeHui <v-phma@microsoft.com>
* [liblzma] Patch headers to fix OpenTTD/OpenTTD#7614 * Bump the version in CONTROL file Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* [docs] Add format document * improve the error message * Check the error message * Finish test * restore file list
* define line endings for ci.baseline.txt * renormalize line endings to lf
* KDE Marble library port * fix in port KDE Marble library * port KDE Marble library: switch to another version * vcpkg_fail_port_install added (since only Windows currently supported) * remove some comments * Update portfile * KDE Marble library port * fix in port KDE Marble library * port KDE Marble library: switch to another version * vcpkg_fail_port_install added (since only Windows currently supported) * remove some comments * Update portfile * small fix in KDE Marble library port * removed ON_LIBRARY_LINKAGE static, and ANDROID FREEBSD * [marble]Fix triplet judgment * [kde] Add x64-windows-static state to baseline * [marble] Re-add x64-windows-static state to baseline * marble port changed * marble profile.cmake small correction * marble: another tiny changes in a port file * marble: patch to move exe to tools * [marble] patch for another QT version * Update ports/marble/CONTROL * move dll files to bin folder (out of tools folder) Co-authored-by: Igor Sandler <isandler@topcon.com> Co-authored-by: Phoebe <v-phma@microsoft.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* [rtmidi] Fix configure CMakeLists.txt * [rtmidi] Rtmidi doesn't support "UWP" * [rtmidi] Disable RTMIDI_API_ALSA on Linux * [rtmidi] Update ci.baseline.txt * [rtmidi] Fix ci.baseline.txt conflicts * [rtmidi] Fix ci.baseline.txt conflicts * [rtmidi] Fix ci.baseline.txt conflicts * Update CONTROL * Update ci.baseline.txt * [rtmidi] Update ci.baseline.txt * [rtmidi] Require static library to avoid issues with CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * Update portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [Simple-FFT] Add new port * Update ports/simple-fft/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Add copyright handling * Update ports/simple-fft/portfile.cmake Co-authored-by: Victor Romero <romerosanchezv@gmail.com> * Update portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
* Add port STX * stx: improve include files handling, disabled shared library support * [stx] remove CMakeLists.txt, add CMakeLists.patch, fixes * Update ports/stx/CMakeLists.patch to remove comments Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * CMakeLists.txt remove comment for installed region * Update ports/stx/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/stx/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Use vcpkg_check_linkage(ONLY_STATIC_LIBRARY) instead of custom logic Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update portfile.cmake Co-authored-by: Jean Gautier <jean.gautier@ssi.gouv.fr> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * upgrade librdkafka to 1.4.4 * Delete CONTROL * Delete install.patch * Delete portfile.cmake * upgrade librdkafka to 1.4.4 Co-authored-by: Alexander Smyslov <aleksandr.smyslov@libertexgroup.com> Co-authored-by: Smyslov Alexander Nikolayevich <aleksandr.smyslov@fxclub.com>
* [openal-soft] MinGW build fixes * [glew] MinGW build fixes * [protobuf] MinGW build fixes * [protobuf] Update to 3.12.3 * [protobuf] Preserve existing cross-compilation behavior (e.g. android) Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* fix mozjpeg build * re-disable in CI baseline * fix static install * rename static libs, add pkgconfig fixup * update version string Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [ogre] Update to version 1.12.7 and fix link error * [ogre] Fix find imgui * [ogre] Fix find imgui * [ogre] Add vcpkg.json * format manifest Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
…s. (#12273) * [fltk] Force static library due to global variables. Fix CMake Targets. * [fltk] Add include directory to exported targets * [fltk] Update ports/fltk/CONTROL Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * Update ports/fltk/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* [winpcap] Remove the keyword 'inline' macro * Restrict the keyword macro in C
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
…#12514) * [mpir] Fix build error if VCPKG_BUILD_TYPE is set as release or debug * Update ci.baseline.txt * EOL LF for vcpkg.json * Update to use vcpkg_configure_make and vcpkg_install_make in UNIX
* [qt5-imageformats] Disable parallel build * [ompl] Disable parallel configure * [qt5-connectivity] Disable parallel build * [qwt] Update hash * [qt5-location] Disable parallel build * Update ports/qwt/portfile.cmake * Update ports/qwt/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [qt5] change build method to vcpkg_execute_build_process * Add condition when there are some file conflicts Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
…r pkg-config (#12569) * Remove required in first find_program call * add usr/local/bin for mac * lets try without cellar and see if osx ci agrees
(cherry picked from commit 497fe8ab805bcafd2cb2abd538db8783f897f9ad)
* [rsocket] Add new port * [rsocket] don't build in some window environment * [rsocket] add missing deps in CONTROL * [rsocket] add missing deps in CONTROL * [rsocket] remove some deprecated args * [rsocket] romove vcpkg_fail_port_install(ON_ARCH x64) * [rsocket] only support x64 architecture * [rsocket] upgrade to 2020.05.04.00 * [rsocket] add vcpkg_fail_port_install to portfile * [rsocket] Fix find dependencies * Update ports/rsocket/portfile.cmake * Update ports/rsocket/CONTROL Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Use vcpkg internal powershell * [protobuf] change vcpkg_copy_tool_dependencies to vcpkg_copy_tools
…pendency (#12420) * [opencolorio-tools] Separate feature application to avoid circular dependency * [opencolorio] Remove oiio related patch * [opencolorio] Do not make tools * [opencolorio-tools] make sure share folder is clean * [docs] Add format document * improve the error message * Check the error message * Finish test * Update ports/opencolorio/portfile.cmake Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Use vcpkg_copy_tools Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* [netcdf-c] Add dependency embree3 * [netcdf-c] remove dependency embree3, change the search sequence * [netcdf-cxx4] Re-fix dependency hdf5 * Update ports/netcdf-c/CONTROL * [netcdf-c] Remove dependency embree
…libraries (#9224) * [boost-modular-build-helper] Fix build issues when release only * Configure Jamroot.jam on linux * Fix indentation Co-authored-by: PhoebeHui <v-phma@microsoft.com>
…#12856) * [openimageio] Add dependency libheif * [pangolin] Fix link to linux system lib libutil * [libheif] Install extra headers for other ports(oiio)
* Update osg to 3.6.5. * Remove port-version Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* [curl] Fix static build * Add static patch
* [vcpkg/script] add vcpkg_find_fortran * [openblas] add pkg-config fixes * [lapack] add lapack-reference and reduce dependency on clapack * fix build issues * dont touch any main files * move toolchain var into parent scope * fix a few more issues * create link in the noblas case * removed unnecessary check handled by vcpkg_find_fortran. * move dumpbin check * fix last issue * depend on openblas * set cmake_binary_dir so that compiler id run gets put into buildtree. * more paths * add missing PARENT_SCOPE * ws change * [mlpack] remove dep on clapack * comment out patches * remove openblas again * Install lapack wrapper since it is missing linkage against -lm and -lgfortran * PREPEND mingw path to make sure cmake picks it up correctly * depend on openblas also on osx * add clapack on windows to skip due to conflicting library installs * add clapack to skip on linux * add -fPIC as a fortran compiler flag * do not add the flag on windows * add gcc explicitly to the cmake args. * ws change * applyrequested changes from CR * fix the failing patch
…12829) * [vcpkg] Fix resolution of default features when using Manifest mode During manifest mode, the dependencies in the manifest should be treated as explicitly specified -- curl[core] should not install curl's default features. * [vcpkg] Improve error message when failed to parse manifest file Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [bzip2] fixes for building release-only * [vcpkg_fixup_pkgconfig] fix spacing in messages * Update ports/bzip2/portfile.cmake Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Update portfile.cmake * back out changes to vcpkg_fixup_pkgconfig Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: wangli28 <wangli28@beyondsoft.com>
* take changes from fontconfig pr * [farmhash] add autoconf * [freexl] add autoconf * [healpix] add autoconf * [libb2] add autoconf * [libwandio] add autoconf and patch * more autoconf * [x264] fix windows build issues * minimal cleanup * [libwandio] some fixes * [vcpkg/scripts/make] add include to C/CXX flags correctly set machine flags for linker * remove unnecessary comments part 1 * cleanup part 2 * cleanup * remove unnecessary code * [pbc] fix osx regressions * [lzokay] format manifest * try to copy sources to fix build issues * add autoconfig to force updated configure scripts * bump port versions of openmpi and ocilib * added lib paths back into vcpkg_build_make because they are probably required * Use CPP flags add quotes around restoring of ENV add LIB and LIBPATH correctly * Apply suggestions from code review Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Apply more changes forom CR - remove mingw make - add doc for missing options - introduce two new macros for backup/restore of env vars * fix wrong variables. * use the list macro instead of the single var macro * also use it at the top Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* adds constexpr-contracts to vcpkg * Update ports/constexpr-contracts/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* Update wpilib port to 2020.3.2 Latest 2020 release * Fix review comments
…-package-info` command (#12845) * [vcpkg] Improve error reporting in vcpkg::Json * [vcpkg] Lift --x-json to a common option * [vcpkg] Address warnings-as-errors in VS2015 * [vcpkg] Remove unused local * [vcpkg] Extract vcpkg::Install::get_cmake_usage * [vcpkg] Implement vcpkg::serialize_ipv(ipv, paths) * [vcpkg] Implement x-package-info to enable tooling * [vcpkg] Fixup tests to respect new cli mode Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
…ared flag (#12056) * [openssl-windows] Added feature option to build openssl with no-pinshared flag * Fix review findings from @NancyLi1013 * Try a CI test re-run * Changed fix to idea from @ras0219-msft * Remove options from message As suggested by @ras0219. Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Update ports/openssl-windows/CONTROL Co-authored-by: Stefan Strauss <stefan.strauss@avira.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [vcpkg] Remove globally-constructed pre-defined Triplets from vcpkg.exe The tool should be as triplet-agnostic as possible, which leaves little room for special, pre-defined names like this. However, tests do have use of them: moved into test assets. * [vcpkg] Move predefined tools strings vcpkgpaths.h -> tools.h * [vcpkg] Add forward declarations to vcpkgpaths.h to reduce header deps * Merge from origin/master Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [tomlplusplus] Update to 2.1.0 * Update portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [vxl] Update patch * Update unsupported variables
* Make sub libraries of FFmpeg optional avdevice avfilter swresample swscale * Also adding avcodec and avformat * This should have been avcodec obviously
* [geogram] update geogram version * [geogram] fix diff patch * [geogram] remove port-Version
* sqlite3 port: add geopoly and json features. * Changed the version of the sqlite3 CONTROL from from 3.31.1-1 to 3.31.1-2 * Update CONTROL * Update CONTROL Co-authored-by: Sanjay Chugh <schugh@intelligenetimagingsystems.com> Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: LilyWangL <wangli28@beyondsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [vcpkg_find_acquire_program] add version check for ninja * Change VERSION to NINJA_VERSION * Missed VERSION change * some more corrections * add missing PACKAGES parameter * add osx hash Co-authored-by: Wolfgang Stöggl <c72578@yahoo.de> * Remove apt/brew package names Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * move supported around and disable it for freebsd * fix small command hickup which does not matter for ninja Co-authored-by: Wolfgang Stöggl <c72578@yahoo.de> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.