From 5fba7f368de778208b1e4f9978fcc174923c6de4 Mon Sep 17 00:00:00 2001 From: Uli Heilmeier Date: Sat, 8 Oct 2016 12:10:38 +0000 Subject: [PATCH] Revert "CMakeLists: Add man files" This reverts commit 55148a2ea470d19290d236428f3c8e725775c96a. Change-Id: If93b97933cae4d8ffd1e4cc9a635def031ab0cc6 Reviewed-on: https://code.wireshark.org/review/18123 Reviewed-by: Guy Harris --- CMakeLists.txt | 2 ++ doc/CMakeLists.txt | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 667fee4bc7..68db05c7a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1834,11 +1834,13 @@ 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 0d57847a98..2b808653f3 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -122,9 +122,6 @@ 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