diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-18 04:42:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 13:42:40 -0700 |
| commit | f18e0b4387571ccf2ee1e0a16509289876ff72b7 (patch) | |
| tree | 73a82f459fb9ec3c412c65a16052a95318a492fb /scripts | |
| parent | 7bf7e816bdd1b9ad9149676aa5bf605f91c52137 (diff) | |
| download | vcpkg-f18e0b4387571ccf2ee1e0a16509289876ff72b7.tar.gz vcpkg-f18e0b4387571ccf2ee1e0a16509289876ff72b7.zip | |
[thrift] Update to 0.13.0 and fix OSX build (#11981)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/azure-pipelines/osx/azure-pipelines.yml | 1 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index a24ed7d95..85fe543c8 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -19,6 +19,7 @@ jobs: brew list autoconf || brew install autoconf
brew list automake || brew install automake
brew list libtool || brew install libtool
+ brew list bison || brew install bison
brew list gfortran || brew cask install gfortran
displayName: 'Install brew dependencies'
- bash: |
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bd27e5d5b..2d2b2ea3d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1824,7 +1824,6 @@ theia:x64-windows-static = skip theia:x86-windows = skip
thor:x64-linux=fail
thor:x64-osx=fail
-thrift:x64-osx=fail
tidy-html5:arm-uwp=fail
tidy-html5:x64-uwp=fail
tinkerforge:arm-uwp=fail
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 9335c70c8..7ff260dc2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -267,6 +267,9 @@ function(vcpkg_find_acquire_program VAR) set(PROGNAME bison) set(APT_PACKAGE_NAME bison) set(BREW_PACKAGE_NAME bison) + if (APPLE) + set(PATHS /usr/local/opt/bison/bin) + endif() endif() elseif(VAR MATCHES "GPERF") set(PROGNAME gperf) |