diff options
| author | João Valverde <j@v6e.pt> | 2019-10-10 15:34:46 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-10-10 15:58:41 +0000 |
| commit | 97cb389a3531269b3c86555156a2bba62ccfd8a5 (patch) | |
| tree | 16a7b35a0e1a1411fcf11ff3e05af31b2e2c57ae /doc | |
| parent | 51fbc7198ef3ebd49c3c491e4a5b3ed72eec278d (diff) | |
Revert "CMake: Don't install HTML manuals twice"
This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993.
NSIS package is broken with this commit.
Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6
Reviewed-on: https://code.wireshark.org/review/34758
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f6866c8066..429deaa4f0 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -7,8 +7,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # -include(CopyStaging) - add_custom_command( OUTPUT AUTHORS-SHORT COMMAND ${PERL_EXECUTABLE} @@ -213,23 +211,6 @@ add_custom_target( ) set_target_properties(docs PROPERTIES FOLDER "Docs") -if(ENABLE_APPLICATION_BUNDLE) - set(DOC_STAGING_DIR "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/Wireshark.app/Contents/Resources/share/doc/wireshark") -else() - set(DOC_STAGING_DIR "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/doc") -endif() - -add_staging_target(docs_copy_staging - DEST "${DOC_STAGING_DIR}" - DEPENDS docs - FILES ${HTML_INSTALL_FILES} -) - -add_staging_target(authors_copy_staging - DEST "${DATAFILE_DIR}" - FILES ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT -) - install( FILES ${MAN1_INSTALL_FILES} @@ -251,13 +232,6 @@ install( ${CMAKE_INSTALL_DOCDIR} ) -install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT - DESTINATION - ${CMAKE_INSTALL_DATADIR} -) - # # Editor modelines - https://www.wireshark.org/tools/modelines.html # |