Wireshark-commits: [Wireshark-commits] master f1285fc: CMake: Don't install HTML manuals twice

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 09 Oct 2019 13:25:07 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f1285fcf061669702ca1accd7b2c50ebc8198993
Submitter: "João Valverde <j@xxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

f1285fc by João Valverde (joao.valverde@xxxxxxxxxxxxxxxxxx):

    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@xxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: João Valverde <j@xxxxxx>
    

Actions performed:

    from  931a804   QUIC: Remove some field of Preferred Address TP before draft-18
     add  f1285fc   CMake: Don't install HTML manuals twice


Summary of changes:
 CMakeLists.txt                    | 36 ------------------------------------
 cmake/modules/CopyStaging.cmake   | 37 +++++++++++++++++++++++++++++++++++++
 debian/libwsutil0.symbols         |  3 ++-
 doc/CMakeLists.txt                | 26 ++++++++++++++++++++++++++
 extcap/androiddump.c              |  2 +-
 extcap/ciscodump.c                |  2 +-
 extcap/randpktdump.c              |  2 +-
 extcap/sdjournal.c                |  2 +-
 extcap/sshdump.c                  |  2 +-
 extcap/udpdump.c                  |  2 +-
 packaging/nsis/wireshark.nsi      | 38 +++++++++++++++++++-------------------
 packaging/wix/ComponentGroups.wxi | 38 +++++++++++++++++++-------------------
 ui/help_url.c                     | 22 +++++++++++-----------
 wsutil/CMakeLists.txt             |  1 +
 wsutil/filesystem.c               | 33 +++++++++++++++++++++++++++++++--
 wsutil/filesystem.h               | 13 +++++++++----
 16 files changed, 161 insertions(+), 98 deletions(-)
 create mode 100644 cmake/modules/CopyStaging.cmake