diff options
| author | Uli Heilmeier <uh@heilmeier.eu> | 2016-09-12 14:30:44 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-10-06 04:23:37 +0000 |
| commit | 67494d47d530335d943a9d127df65c13d9e7e556 (patch) | |
| tree | 9cddf1f8e895c092b802f6b4bee5b70ebf980434 | |
| parent | 17b5beee40613dc721c11ae8eb84a0c18f7ef327 (diff) | |
| download | wireshark-67494d47d530335d943a9d127df65c13d9e7e556.tar.gz | |
CMakeLists: Add man files
Current Wireshark.app bundle on OS X doesn't include man pages.
Change-Id: I4123105ae805c3f127dbfd74768b88d4da546c56
Ping-Bug: 12746
Reviewed-on: https://code.wireshark.org/review/17902
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 55148a2ea470d19290d236428f3c8e725775c96a)
Reviewed-on: https://code.wireshark.org/review/18084
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 25aead7f75..5bff191187 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1769,13 +1769,11 @@ 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 ) # 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 ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index fea2fb5227..716fd0e7a5 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -120,6 +120,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 |