diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2015-06-24 04:22:16 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2015-06-24 02:31:15 +0000 |
| commit | ae92a8347ee5682020be0d8b92134d79c5420809 (patch) | |
| tree | 842e4404f292c4a5ee9ecb35549d60923a851a8d /macosx-setup.sh | |
| parent | 14252551b26ecbcaed38a2c0a0b7a6b45b62f4f6 (diff) | |
Update build instructions for cmake near the end a bit
Change-Id: I7d5b8ab3479cc4268b6cc5ae7822066a69b740dc
Reviewed-on: https://code.wireshark.org/review/9085
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index c0eeb29418..fe192952e5 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -2287,11 +2287,13 @@ install_all echo "" # -# Indicate what path to use for pkg-config. +# Indicate what paths to use for pkg-config and cmake. # pkg_config_path=/usr/local/lib/pkgconfig if [ "$QT_VERSION" ]; then - pkg_config_path="$pkg_config_path":"$HOME/Qt$QT_VERSION/$QT_MAJOR_MINOR_VERSION/clang_64/lib/pkgconfig" + qt_base_path=$HOME/Qt$QT_VERSION/$QT_MAJOR_MINOR_VERSION/clang_64 + pkg_config_path="$pkg_config_path":"$qt_base_path/clang_64/lib/pkgconfig" + CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH":"$qt_base_path/lib/cmake" fi pkg_config_path="$pkg_config_path":/usr/X11/lib/pkgconfig @@ -2299,8 +2301,12 @@ echo "You are now prepared to build Wireshark. To do so do:" echo "export PKG_CONFIG_PATH=$pkg_config_path" echo "" if [ -n "$CMAKE" ]; then + echo "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH + echo "export PATH=$PATH:$qt_base_path/bin echo "mkdir build; cd build" echo "cmake .." + echo "make $MAKE_BUILD_OPTS app_bundle" + echo "make install/strip echo echo "or" echo @@ -2308,7 +2314,6 @@ fi echo "./autogen.sh" echo "mkdir build; cd build" echo "../configure" -echo "" echo "make $MAKE_BUILD_OPTS" echo "make install" |