diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-08-27 14:39:50 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-09-21 00:49:01 +0000 |
| commit | ed158952210f79dab7365e325d3c180fea26631e (patch) | |
| tree | 794a179a934cdf911ee02fc8980762e966831725 /tools | |
| parent | e2a2618d9bbad3be872b0f7b98647fc901bcf93d (diff) | |
cmake: look for Qt5 from Homebrew on macOS
When Qt5 is installed using Homebrew on macOS, Qt5 is not available in
the default prefix. Remove the hack from macos-setup-brew.sh and adjust
the search path instead. Note that is needed for development, "brew
install" has already set this option in the environment.
See https://github.com/Homebrew/homebrew-core/issues/8392
Change-Id: I57ea09b649a94c9a4cb18b1b2d334808e47ec27e
Reviewed-on: https://code.wireshark.org/review/23232
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/macos-setup-brew.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/macos-setup-brew.sh b/tools/macos-setup-brew.sh index 0d898a0761..45ca995497 100755 --- a/tools/macos-setup-brew.sh +++ b/tools/macos-setup-brew.sh @@ -30,13 +30,6 @@ brew install c-ares glib libgcrypt gnutls lua cmake nghttp2 snappy lz4 libxml2 #install Qt5 brew install qt5 -#Fix qt5 lib link -brew link --force qt5 -VERSION=`brew info qt5 | grep /usr/local/Cellar | tail -n 1 | cut -d '/' -f6 | cut -d ' ' -f1` -#sudo rm /usr/local/mkspecs /usr/local/plugins -sudo ln -s /usr/local/Cellar/qt5/$VERSION/mkspecs /usr/local/ -sudo ln -s /usr/local/Cellar/qt5/$VERSION/plugins /usr/local/ - # # Editor modelines # |