Commit Graph

1830 Commits

Author SHA1 Message Date
Alexander Neumann
86db69b341
re-enable qt5-activeqt (#20083)
* remove qt5-activeqt from baseline

* add colmap as baseline fail
2021-09-13 14:32:56 -07:00
Billy O'Neal
c26477297c
Update pwsh to 7.1.14, separate image minting from vmss minting, and update VMs. (#20064)
* Update Powershell-Core to 7.1.4.

* Add deployment of .NET 4.7.2 targeting pack, extracted from https://github.com/microsoft/vcpkg/pull/19320

* Separate image minting from vmss minting.

* Update pools.

* Fix image minting typo on Windows.
2021-09-11 13:43:19 -07:00
Billy O'Neal
a241dd2859
[vcpkg] Update tool to 2021-09-10. (#20105)
Resolves:
* https://github.com/microsoft/vcpkg/issues/19552
* https://github.com/microsoft/vcpkg/issues/18217
* https://github.com/microsoft/vcpkg/issues/16631

See https://github.com/microsoft/vcpkg-tool/releases/tag/2021-09-10 for more details.
2021-09-10 18:28:18 -07:00
chausner
cda50b3ecc
[David-Haim/concurrencpp] Add new port (#19997)
* [David-Haim/concurrencpp] Add new package

* Format vcpkg.json

* Add baseline

* Fix version

* Update CI baseline

* Revert "Update CI baseline"

This reverts commit 8e3ed430f2.

* Add patch to make linkage configurable

* Update git-tree hash

* Add patch to set -fcoroutines flag

* Update git-tree hash

* Revert "Update git-tree hash"

This reverts commit b3ccdb2c61.

* Revert "Add patch to set -fcoroutines flag"

This reverts commit a23c736df9.

* Revert "Revert "Update CI baseline""

This reverts commit a50ed32a97.

* Add supports attribute to manifest, disallow dynamic linkage on Windows

* Update git-tree hash

* Apply suggestions from code review

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Fix whitespace

* Update git-tree hash

* Add vcpkg-cmake dependencies to vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Adapt for version 0.1.3, address suggestions

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
2021-09-10 14:18:06 -07:00
autoantwort
c24f57e9fc
[meson] fix cross compiling from linux to windows (#18927)
* [meson] fix cross compiling from linux to windows

* Fix mingw system name

* Omit empty fields from standard libraries

* Use VCPKG_CROSSCOMPILING

* vcpkg_configure_meson: do not double escape include paths

* vcpkg_configure_meson: set winres instead of rc

* vcpkg_configure_meson: do not always cross build

* Apply suggestions from code review

* fix the issue I made

* [meson] error when gcc uses a different linker executeable

* [meson] apply code review from strega-nil

* [meson] more verbose error messages

* [meson] remove wrong check

Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-09-09 20:41:01 -07:00
autoantwort
f0c569e3e5
[msbuild] add vcpkg to <Lib> search path (#20054) 2021-09-08 12:21:06 -07:00
NancyLi1013
6ea34201f3
[h3/jaeger-client-cpp] Update to the latest version (#20008)
* [h3/jaeger-client-cpp] Update to the latest version

* Remove CONTROL files

* Update version files

* Update patch

* Update versions/j-/jaeger-client-cpp.json
2021-09-08 08:00:54 -07:00
NancyLi1013
5b2ac1fed8
[libhsplasma/libpcap/lv2/libcrafter] Update to the latest version (#19965)
* [libhsplasma/libpcap/lv2] Update to the latest version

* [libpcap] Remove unused comments

* Update version files

* [lv2] Fix usage
[libpcap] Update ci.baseline.txt

* [libhsplasma] Remove x64-windows-static=fail from ci.baseline.txt

* [libcrafter] Update to 1.0

* [libcrafter] Add vcpkg.json

* Update version files

* Add CRT check for libpcap and update version as versin-semver for libpcap

* Update version files

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-08 07:45:37 -07:00
Geoff Evans
4d8cf181f1
proj4 uwp improvments (#18323)
* Remove prior arm/uwp patch since host dependencies now allow for proj database generation, and add a new patch that repairs Win32 API calls to use UWP counterparts in UWP builds

* Update ci baseline for port changes

* Update port version

* Fix patch list for PR

* Bump port-version, disable some broken downstream libs

* Update port version commit
2021-09-07 21:02:10 -07:00
Billy O'Neal
f78c96f706
Decouple the storage account used for binary caching from the images. (#19912)
* Decouple the storage account used for binary caching from the images.

We are being forced to change infrastructure somewhat more frequently than we would like, so change the binary caches to use a shared storage account like we already use for asset caching.

* blob blob blob

* Add quotes

* Avoid name stomping.
2021-09-03 00:02:29 -07:00
Billy O'Neal
4934cb4099
Apply @workpadwan 's fix to bootstrap.sh on non-bash systems. (#19911) 2021-09-02 13:09:42 -07:00
Billy O'Neal
8791fbac5d
[qt5-activeqt, qt5-declarative] Skip activeqt in CI. (#19945)
See https://github.com/microsoft/vcpkg/issues/19922
2021-09-02 12:53:12 -07:00
Billy O'Neal
97e7ac8d74
[vcpkg] Repair msbuild damage and workaround the way we integrate on VS2015. (#19767)
* Repair msbuild damage and workaround the way we integrate on VS2015.

This is a fix for a pile of issues discovered by https://github.com/microsoft/vcpkg/pull/18906

* VS 2015 has a bug that the <VcpkgInstalledDir Condition="!$(VcpkgInstalledDir.EndsWith('\'))">$(VcpkgInstalledDir)\</VcpkgInstalledDir> dance we do to get a trailing slash is not applied correctly when VcpkgInstalledDir was edited in the same property group attempting to add the trailing slash.
* We need a trailing slash on VcpkgInstalledDir at all times, but https://github.com/microsoft/vcpkg/pull/16173 damaged this by removing it from TreatAsLocalProperty. Add the right TreatAsLocalPropertys back. Add all such slash defenses to the top of the file just beneath, eliminating need to call Path::Combine and friends by following msbuild "directory properties have a trailing slash" convention.
* Move VcpkgOSTarget and VcpkgPlatformTarget into the .targets, as they aren't intended to be overridable by users and don't appear in our selection dialog box(es).
* Don't bother avoiding setting vcpkg properties when VcpkgEnabled is off; after all, VcpkgEnabled is itself a vcpkg property :). I left attempts to skip creating items since creating items can hit the disk.
* Add _Z to several internal msbuild variables.
* Move VcpkgApplocalDeps to the .props since it's a user setting.
* Don't unconditionally use $(TLogLocation) because it is not set on 2015, and also it's per-project.
* Fixed typo in docs "VcpkgInstalledDirectory", and document the limitation that it doesn't work in 2015.
* In manifest mode, put the installed tree in a subdirectory including the triplet to make changing configurations faster.

Known limitations:

* If you change vcpkg.json without changing any .cpp files, we don't rebuild the dependencies even though we should. I don't know how to fix this but it doesn't appear to be a regression.

* Fix .tlog handling.

* Further defend against modified properties on VS2015.

* Document more VS2015 limitations.

* Remove TreatAsLocalProperty comment.
2021-09-02 12:33:21 -07:00
Joachim Gehweiler
7734e8b89d
[tensorflow] fix macOS build errors caused by numpy and bazel upgrades (#19363)
* Revert "incorporate changes from microsoft:master"

* Revert "Revert "incorporate changes from microsoft:master""

* issue targeted in newer numpy version

* work-around for broken numpy libs on macOS

* temporarily add debug code to analyze CI failures

* again temporary debug code

* fix linkage command on macOS (broken by Bazel upgrade)

* fix regex for macOS linker command

* remove debug code, bump version

* x-add-version seems to require a separate commit...

* Fix misspelled "acceleration".

* x-add-version

Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-01 14:29:50 -07:00
Phoebe
021e10a7d5
[vcpkg_from_github] Fix version regex matching issue (#19815) 2021-09-01 11:10:22 -07:00
Stephen Kyne
a761a22de8
[liblo] Fix filenames for linux in liblo portfile (#19660)
* Fix filenames for linux vs windows in liblo portfile

* Removed deprecated call and now using vcpkg_copy_tools

* Upgraded to manifest file

* Increment port-version

* Remove now working builds from ci.baseline

* Updated versioning files

* Fixed type for vcpkg.json

* Updated sha for liblo version
2021-08-30 18:35:02 -07:00
autoantwort
cda8ba09f3
fix bootstrap.sh on arm macs (#19622) 2021-08-30 10:23:57 -07:00
autoantwort
642666976a
Document VCPKG_TARGET_IS_MINGW (#19790) 2021-08-30 10:18:49 -07:00
autoantwort
8602e5facb
bootstrap.sh: fails if there is no entry for a tool os combination (#19640) 2021-08-30 09:50:49 -07:00
Kevin Lalumiere
c13c218522
[vcpkg] Add triplet option VCPKG_NO_COMPILER_TRACKING (#17526) 2021-08-25 20:36:28 -07:00
InfRandomness
9c1232681e
[vcpkgTools.xml] Update cmake 3.20.4 hash for freebsd (#19697) 2021-08-24 16:13:30 -07:00
NancyLi1013
91aec79128
[tinyfiledialogs] Fix usage (#19723)
* [tinyfiledialogs] Fix usage

* Update version files
2021-08-24 14:50:54 -07:00
Phoebe
025e564979
[vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert #19469 (#19633)
* [vcpkg_cmake_config_fixup] Revert #19469

* Update the version date

* actually just revert

* move stuff around in vcpkg-cmake-config.json file

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-08-20 14:46:02 -07:00
InfRandomness
6aa310ae75
[freebds] Fix vcpkg-tool compilation issue (#19641)
Adds an xml entry to cmake 3.20.4 for freebsd 13
2021-08-20 14:32:58 -07:00
James Athey
bd7fc2c75b
[libconfig] fix compilation errors on macos (#19374)
* remove "find_path(STDINT_H stdint.h)". On clang/macos, this picks up the kernel headers version of stdint.h, instead of the C standard library, breaking compilation
* only define YY_NO_UNISTD_H and YY_USE_CONST on Windows, like the upstream CMakeLists.txt
* set the C standard to C99, like the upstream CMakeLists.txt
* update to 1.7.3
* remove the "fail" line from ci.baseline.txt
* run ./vcpkg x-add-version --all to update metadata files
* reset port-version
2021-08-18 17:24:14 -07:00
ras0219
d679a1e0be
[vcpkg_fixup_pkgconfig] HOTFIX -- revert #19469 (#19607)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-08-16 23:00:01 -07:00
nicole mazzuca
99e06a64ec
[rollup:2021-08-09] Rollup PR (#19469)
* [rollup:2021-08-09] PR #16706 (@JackBoosY)

[vcpkg_fixup_cmake_targets] Fix up OSX system development path

* [rollup:2021-08-09] PR #19238 (@strega-nil)

[scripts-audit] vcpkg_download_distfile

* [rollup:2021-08-09] PR #19239 (@strega-nil)

[scripts-audit] vcpkg_find_fortran

* [rollup:2021-08-09] PR #19338 (@strega-nil)

[tinyfiledialogs] Fix for good

* [rollup:2021-08-09] PR #19348 (@strega-nil)

[scripts-audit] vcpkg_fixup_pkgconfig

* fix ports.cmake with newer vcpkg_download_distfile

* fix vcpkg create

* move vcpkg_common_definitions down so that it's not incorrect

* fix vcpkg_internal_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-16 13:42:31 -07:00
Jack·Boos·Yu
6bc4362fb4
[vcpkg_find_fortran] Update libiconv and zlib hash (#19545)
* [vcpkg_find_fortran] Update libiconv hash

* Fix more hash
2021-08-13 22:37:08 -07:00
Billy O'Neal
e22f9d7d70
Update VMs for Patch Tuesday, 2021-08-11 (#19508)
* Deploy SDKs with full features first to ensure we get Debugging Tools for Windows.

* Update VMs for Patch Tuesday, 2021-08-11
2021-08-13 16:12:24 -07:00
Stefano Sinigardi
801f40c688
[OpenCV] update to v4.5.3 and to v3.4.15 (#18827)
* [OpenCV] update to v4.5.3 and to v3.4.15

* [OpenCV] update refs

* [libxml2] add missing find_dependency(Iconv)
[libiconv] update cmake wrapper

* [libiconv] fix hints

* [opencv4] do not require cudnn if cuda enabled

* [opencv] update refs

* [OpenCV] increase CI coverage even more

* [vcpkg-ci-opencv] trying to restore x64-uwp ci tests

* restore previous patches to avoid unnecessary modifications

* [OpenCV] fix refs

* [OpenCV] fix CMake Warning related to protobuf dependency

* [OpenCV] fix refs

* [libxml2] fix references

* [libxml2] restore previous cmake wrapper, new one is broken

* [libxml2] fix references

* bump versions

* update refs

* [libxml2] Update the format for vcpkg-cmake-wrapper.cmake

* Update versions/l-/libxml2.json

* [libxml2] update port version

* [libxml2] update refs

* [OpenCV] fix refs

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-08-13 13:57:28 -07:00
Billy O'Neal
dfceb055d5
Skip embree2 in CI for static triplets due to conflicts. Common name problem reported upstream as https://github.com/embree/embree/issues/331 (#19553)
```
Starting package 3/3: embree3:x64-windows-static
Building package embree3[avx,avx2,core,sse2,sse42]:x64-windows-static...
-- Using C:/Dev/vcpkg/downloads/embree-embree-v3.12.2.tar.gz
-- Extracting source C:/Dev/vcpkg/downloads/embree-embree-v3.12.2.tar.gz
-- Applying patch fix-path.patch
-- Applying patch fix-static-usage.patch
-- Applying patch cmake_policy.patch
-- Applying patch fix-targets-file-not-found.patch
-- Using source at C:/Dev/vcpkg/buildtrees/embree3/src/v3.12.2-cbae4ce8b1.clean
-- Found external ninja('1.10.2').
-- Configuring x64-windows-static-dbg
-- Configuring x64-windows-static-rel
-- Building x64-windows-static-dbg
-- Building x64-windows-static-rel
-- Installing: C:/Dev/vcpkg/packages/embree3_x64-windows-static/share/embree3/copyright
-- Performing post-build validation
-- Performing post-build validation done
Building package embree3[avx,avx2,core,sse2,sse42]:x64-windows-static... done
Installing package embree3[avx,avx2,core,sse2,sse42]:x64-windows-static...
The following files are already installed in C:/Dev/vcpkg/installed/x64-windows-static and are in conflict with embree3:x64-windows-static

Installed by embree2:x64-windows-static
    debug/lib/embree_avx.lib
    debug/lib/embree_avx2.lib
    debug/lib/embree_sse42.lib
    debug/lib/lexers.lib
    debug/lib/math.lib
    debug/lib/simd.lib
    debug/lib/sys.lib
    debug/lib/tasking.lib
    lib/embree_avx.lib
    lib/embree_avx2.lib
    lib/embree_sse42.lib
    lib/lexers.lib
    lib/math.lib
    lib/simd.lib
    lib/sys.lib
    lib/tasking.lib

Please ensure you're using the latest portfiles with `.\vcpkg update`, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
  Package: embree3:x64-windows-static
  Vcpkg version: 2021-08-12-85ab112d5ee102bc6eac8cdbbfdd173a71374e04

Additionally, attach any relevant sections from the log files above.
```
2021-08-13 13:39:28 -07:00
Billy O'Neal
c801072693
[vcpkg] Update tool to 2021-08-12. (#19543)
Resolves #17897
2021-08-12 20:49:50 -07:00
David Chisnall
ad42c88e51
The FreeBSD spelling of x86-64 is amd64. (#19456)
CMAKE_HOST_SYSTEM_PROCESSOR is set to amd64 on x86-64 FreeBSD systems.
CMake's STREQUAL gives a case-sensitive comparison so this case was
missed during bootstrapping when using vcpkg as a submodule.
2021-08-11 19:25:56 -07:00
NancyLi1013
c315cf92f7
[keystone] Fix static build with dynamic CRT on Windows (#19491)
* [keystone] Fix static build with dynamic CRT on Windows

* Add port-version

* Update version files

* Add double quotes for the path

* Update versions/k-/keystone.json

* Add comments for kstool

* Update versions/k-/keystone.json
2021-08-11 17:18:20 -07:00
Jack·Boos·Yu
9d4c559751
[cmake] Update to 3.21.1 (#18955) 2021-08-11 17:06:39 -07:00
myd7349
69478c5caa
[vcpkg-cmake] Fix vcpkg_copy_pdbs false alarm (#19369) 2021-08-10 10:00:29 -07:00
Phoebe
e1e7daf3ab
[vcpkg baseline][rbdl-orb/rbdl/ptex] file conflicts, skip rbdl-orb in CI testing (#19453)
* [vcpkg baseline][rbdl-orb/rbdl] file conflicts, skip rbdl-orb in Ci testing

* [ptex] Add DISABLE_PARALLEL_CONFIGURE

* Update the baseline version

* Add missing quotes

* Update the baseline version
2021-08-09 09:07:37 -07:00
Kai Pastor
57bd7102d9
[vcpkg baseline][vcpkg_configure_make] Pass make tool to vcpkg_build_make (#19361)
* Pass 'make' between vcpkg scripts

* Restore original BSD gmake lookup

* [starlink-ast] Add ADDITIONAL_MSYS_PACKAGES to vcpkg_configure_make

* [starlink-ast] x-add-version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-08-07 07:48:44 -07:00
JonLiu1993
5742e878fc
update find_fortran.cmake (#18876) 2021-08-05 16:30:33 -07:00
Robert Schumacher
0fd101a2c5
[7zip] Upgrade vcpkgTools 7zip to 19.00 msi (#19365) 2021-08-05 16:25:37 -07:00
Carlos O'Ryan
297349f923
[vcpkg] add support to bootstrap.sh for CXX vars with ccache (#19386)
Co-authored-by: Scott Hart <sdhart@google.com>
2021-08-05 15:44:18 -07:00
autoantwort
e7c0115660
[c4core] builds on mac (#19269)
* [c4core] supports osx

* add version files
2021-08-05 03:12:31 -07:00
nicole mazzuca
fa43004f0c
[vcpkg-tool] Update to 2021-08-03 (#19347) 2021-08-04 14:20:23 -07:00
nicole mazzuca
ff190a561a
[macos ci] update 2021-07-27 (#19207)
* update 2021-07-27

macOS -> 11.5.1, XCode -> 12.5.1

* update azure-pipelines

* update sha of macfuse

* change how macos-ci-base works

* fix build errors

* fix itpp:linux

* more fixes

* remove tab

* allow version changes in all the remove/rename-version patches

* fix libunistring for real

* robert CR
2021-08-04 13:27:40 -07:00
Jack·Boos·Yu
b7f99c3c4b
[vcpkg-cmake] Fix docs and usage of option MAYBE_UNUSED_VARIABLES (#19245)
* Remove unused cmake options and MAYBE_UNUSED_VARIABLES values

* Update MAYBE_UNUSED_VARIABLES docs

* update version

* version stuff

* version stuff

* update docs
2021-08-03 10:42:34 -07:00
Kai Pastor
77935240e5
Always use msys make on win32 host (#19164) 2021-08-02 16:51:02 -07:00
Billy O'Neal
6b6b1e3b0b
Avoid rmdir the downloads directory is nonexistent. (#19314) 2021-08-02 15:16:08 -07:00
Billy O'Neal
403c952a0c
Clean the downloads directory every CI run. (#19311)
Now that vcpkg has artifact caching, meaning downloading artifacts usually doesn't have to leave the datacenter, there's no need to potentially dirty different runs with leftover downloads from each other.

This resulted in some "impossible" results in https://github.com/microsoft/vcpkg/pull/18687 where a previous PR run accidentially downloaded the Windows version of nodejs to /mnt/vcpkg-ci/downloads/node-v14.17.4-linux-x64.tar.xz
2021-08-02 14:15:48 -07:00
nicole mazzuca
a5a70c7c3e
[vcpkg_minimum_required] fix, add unit tests (#19257)
* fix vcpkg_minimum_required

drive-by scripts audit

* initial unit tests

* finish unit tests
2021-07-30 12:57:07 -07:00
nicole mazzuca
5304f826b5
[rollup] 2021-07-26 (#19157)
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)

[scripts-audit] vcpkg_copy_tools and friends

* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)

[vcpkg] Fix toolchain compatibility with cmake < 3.15

* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)

[cmake-guidelines] Minor update, for `if()`

* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)

[scripts-audit] vcpkg_check_linkage

* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)

[vcpkg.cmake] Fix variable case.

* [rollup:2021-07-26 6/6] PR #18839

[scripts-audit] z_vcpkg_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-07-29 09:47:35 -07:00