From f18e0b4387571ccf2ee1e0a16509289876ff72b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Thu, 18 Jun 2020 04:42:40 +0800
Subject: [thrift] Update to 0.13.0 and fix OSX build (#11981)

---
 scripts/azure-pipelines/osx/azure-pipelines.yml | 1 +
 scripts/ci.baseline.txt                         | 1 -
 scripts/cmake/vcpkg_find_acquire_program.cmake  | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

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)
-- 
cgit v1.2.3