diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-01 14:00:51 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-01 21:04:26 +0000 |
| commit | cf3d279e046053aa39846f108ad4769189211bda (patch) | |
| tree | 04d33af199dee5b78c6f721bb6a5a09cf1f7d246 | |
| parent | 57d954e1689ab31c6afac0a787f13754b8a39a49 (diff) | |
CMake: OS X packaging updates.
Add a dmg_package_prep target as an alias to app_bundle. Rename the
osx-dmg target to dmg_package. This matches the Windows packaging
target names.
In osx-app.sh, make sure we rpathify the bundle plugin directory.
Change-Id: If41195c9d405ad6bff865625500a8227b77e8092
Reviewed-on: https://code.wireshark.org/review/10734
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f1bd356ab..0ec767c633 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2301,18 +2301,14 @@ if(ENABLE_APPLICATION_BUNDLE) ) add_dependencies(app_bundle ${PROGLIST}) + add_custom_target(dmg_package_prep DEPENDS app_bundle) + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo COMMAND ${CMAKE_COMMAND} -E echo APPLWshk > ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo ) - ADD_CUSTOM_TARGET( osx-app - COMMAND ${CMAKE_SOURCE_DIR}/packaging/macosx/osx-app.sh - DEPENDS ${CMAKE_BINARY_DIR}/run/Wireshark.app - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run - ) - - ADD_CUSTOM_TARGET( osx-dmg + ADD_CUSTOM_TARGET( dmg_package COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/ipmap.html" $<TARGET_FILE_DIR:wireshark> @@ -2345,7 +2341,9 @@ if(ENABLE_APPLICATION_BUNDLE) ${CMAKE_BINARY_DIR}/run/dmg_background.png COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh --source-directory ${CMAKE_SOURCE_DIR}/packaging/macosx - DEPENDS osx-app + # Unlike nsis_package_prep + nsis_package, we can add a direct + # dependency here. + DEPENDS dmg_package_prep # We create Wireshark.app in "run". Do our work there. WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run ) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 7b77b5df2a..6a7f061f51 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -625,6 +625,7 @@ rpathify_files () { fi rpathify_dir "$pkgbin" "*" rpathify_dir "$pkgbin/extcap" "*" + rpathify_dir "$pkgplugin" "*" } PATHLENGTH=`echo $LIBPREFIX | wc -c` |