diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2019-09-27 23:03:13 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-10-09 13:24:58 +0000 |
| commit | f1285fcf061669702ca1accd7b2c50ebc8198993 (patch) | |
| tree | e4e0e83535f5de15388d4af4e80841b28ef99a89 /doc | |
| parent | 931a80492da92fe29fab6ac41eb219a6ca6b53d7 (diff) | |
CMake: Don't install HTML manuals twice
HTML docs are installed to both $docdir and $pkgdatadir. Fix that
to install to $docdir only.
Change-Id: I115158585b6df9170d9a01249adbc8548df91f14
Reviewed-on: https://code.wireshark.org/review/34640
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, 26 insertions, 0 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 429deaa4f0..f6866c8066 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -7,6 +7,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later # +include(CopyStaging) + add_custom_command( OUTPUT AUTHORS-SHORT COMMAND ${PERL_EXECUTABLE} @@ -211,6 +213,23 @@ 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} @@ -232,6 +251,13 @@ 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 # |