osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMakeLists: Add man files 

Current Wireshark.app bundle on OS X doesn't include man pages.

This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0
has been reverted. Now cmake gets the information that the man files
are generated.

Bug: 12746
Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb
Reviewed-on: https://code.wireshark.org/review/18170
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Uli Heilmeier 2016-10-12 21:55:54 +02:00 committed by Guy Harris
parent 25e7b63ea5
commit 9a6539990d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1844,15 +1844,15 @@ if(ENABLE_APPLICATION_BUNDLE)
)
# Wireshark.app/Contents/Resources/share/man/man1
set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${MAN1_FILES})
set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN1_FILES} PROPERTIES
MACOSX_PACKAGE_LOCATION Resources/share/man/man1
GENERATED 1
)
# Wireshark.app/Contents/Resources/share/man/man1
set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${MAN4_FILES})
set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN4_FILES} PROPERTIES
MACOSX_PACKAGE_LOCATION Resources/share/man/man4
GENERATED 1
)
# INSTALL_FILES and INSTALL_DIRS are handled by copy_data_files

3
doc/CMakeLists.txt
View File

@ -122,6 +122,9 @@ set(MAN4_INSTALL_FILES
${CMAKE_CURRENT_BINARY_DIR}/wireshark-filter.4
)
set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${MAN1_INSTALL_FILES} PARENT_SCOPE)
set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${MAN4_INSTALL_FILES} PARENT_SCOPE)
set(HTML_INSTALL_FILES
${CMAKE_CURRENT_BINARY_DIR}/asn2deb.html
${CMAKE_CURRENT_BINARY_DIR}/androiddump.html