diff options
| author | Jim Young <jyoung@gsu.edu> | 2018-12-09 19:00:50 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-12-13 09:34:45 +0000 |
| commit | 320bc8037170e1f5eaaf51e926ff5c237840faab (patch) | |
| tree | ed2e247a1a320466b8ddab850431bfaa9a197d0e /tools/macos-setup.sh | |
| parent | d2d7da1f5c3581180698feb70bc2b4ec01b6b550 (diff) | |
macOS: fixup qt_base_path in macos-setup.sh
Recent Qt installations include the entire 3-tuple version string
(e.g. 5.9.7) for the parent folder name directly above the clang_64
folder. Use the entire version string when constructing the
recommended build environment export statements.
Change-Id: I779d487a3b794dde57214639a79727edb111835f
Reviewed-on: https://code.wireshark.org/review/30983
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tools/macos-setup.sh')
| -rwxr-xr-x | tools/macos-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 29a1a3e3f7..d28b59eb68 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -2580,7 +2580,7 @@ echo "" # pkg_config_path=/usr/local/lib/pkgconfig if [ "$QT_VERSION" ]; then - qt_base_path=$HOME/Qt$QT_VERSION/$QT_MAJOR_MINOR_VERSION/clang_64 + qt_base_path=$HOME/Qt$QT_VERSION/$QT_VERSION/clang_64 pkg_config_path="$pkg_config_path":"$qt_base_path/lib/pkgconfig" CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH":"$qt_base_path/lib/cmake" fi |