diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-03-26 12:55:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 12:55:34 -0700 |
| commit | b5bb1511f0a07be530e0bde3ae098eb3d8e83e68 (patch) | |
| tree | 62f7ed43202e512d28ac92fb2be768283f62dee9 /scripts/azure-pipelines | |
| parent | 6a63ecae92e3eb26ae596e5c4ddf527f045803a4 (diff) | |
| download | vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.tar.gz vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.zip | |
[many ports] Apply host dependencies (#16479)
* [vcpkg] Add VCPKG_HOST_TRIPLET. Improve vcpkg.schema.json
* [many ports] Apply host dependencies
* [yasm-tool] Revert yasm-tool changes to split into PR #16478
* [many ports] Add versions
* [vcpkg.cmake] Revert change applied in other PR
* [boost-modular-build-helper] Merge from master
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts/azure-pipelines')
| -rwxr-xr-x | scripts/azure-pipelines/test-modified-ports.ps1 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 9ca814cca..fa80a1a10 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -138,9 +138,7 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` # WORKAROUND: the x86-windows flavors of these are needed for all cross-compilation, but they are not auto-installed.
# Install them so the CI succeeds:
-if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp')) {
- .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows yasm-tool:x86-windows ampl-mp:x86-windows @commonArgs
-} elseif ($Triplet -in @('x64-windows', 'x64-windows-static', 'x64-windows-static-md')) {
+if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp', 'x64-windows', 'x64-windows-static', 'x64-windows-static-md')) {
.\vcpkg.exe install yasm-tool:x86-windows @commonArgs
}
|