Skip to content

Commit

Permalink
cmake: update macOS build instructions for the app build builds
Browse files Browse the repository at this point in the history
The application build should be used for a mac os build, and
these changes should create a standalone app that can be transferred
to the applications with all the plugin information needed as
part of the setup.

Signed-off-by: Charles Hardin <charles.hardin@chargepoint.com>
  • Loading branch information
carlnorum-cpi authored and chardin-cpi committed Dec 26, 2022
1 parent a8145ca commit 41c5261
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
10 changes: 10 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,16 @@ else(Wireshark_FOUND)
DESTINATION ${PLUGIN_INSTALL_VERSION_LIBDIR}/epan NAMELINK_SKIP
)

if(APPLE)
add_custom_target(v2glua
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/dissector/v2g.lua
${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
DEPENDS v2gexi
)
add_dependencies(plugins v2glua)
endif()

file(GLOB PLUGIN_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
CHECKAPI(
NAME
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,14 @@ the build steps.
```
mkdir -p build && cd build
# brew doesn't setup cmake correctly - so qt5 path might be different
env CMAKE_PREFIX_PATH=$(brew --prefix)/Cellar/qt@5/5.15.5_1 \
cmake ..
# brew qt is not in a directly findable place, so tell cmake about it
env CMAKE_PREFIX_PATH=$(brew list qt5 | grep Qt5CoreConfig.cmake | \
sed -e 's@/lib/cmake.*$@@') cmake ..
make VERBOSE=1
sudo make install
make -j$(sysctl -n hw.ncpu) plugins app_bundle
# Recommended installation directory
cp -r run/Wireshark.app /Applications/
```

### Windows
Expand Down

0 comments on commit 41c5261

Please sign in to comment.