Wireshark · Wireshark-commits: [Wireshark-commits] master 3b46e6e: Having CmakeListsCustom.txt in git defeats the purpose of its ex

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3b46e6eaf61a29f9bd8f8c162caa54cc2ea81fe2
Submitter: Jörg Mayer (jmayer@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

3b46e6e by Joerg Mayer (jmayer@xxxxxxxxx):

    Having CmakeListsCustom.txt in git defeats the purpose of its existence:
    If it is used, there is a modified file in git.
    Fix this by only including the file if it exists.
    Other changes:
    - Rename the existing Custom files to CMakeListsCustom.txt.example.
    - Move the plugins custom file to the top level (same level as its
      including parent).
    - Optionally allow a list of custom includes instead of the default one.
    
    Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6
    Reviewed-on: https://code.wireshark.org/review/4163
    Reviewed-by: Jörg Mayer <jmayer@xxxxxxxxx>
    

Actions performed:

    from  84629f4   AJTOOLS-4 Data field not being parsed properly by WireShark plugin if two or more AllJoyn Messages are combined in single TCP packet.
    adds  3b46e6e   Having CmakeListsCustom.txt in git defeats the purpose of its existence: If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its   including parent). - Optionally allow a list of custom includes instead of the default one.


Summary of changes:
 CMakeLists.txt                                     |    4 +++-
 ...ListsCustom.txt => CMakeListsCustom.txt.example |    2 +-
 cmake/modules/UseCustomIncludes.cmake              |   20 ++++++++++++++++++++
 epan/CMakeLists.txt                                |    2 +-
 ...istsCustom.txt => CMakeListsCustom.txt.example} |    0
 ui/gtk/CMakeLists.txt                              |    2 +-
 ...istsCustom.txt => CMakeListsCustom.txt.example} |    0
 7 files changed, 26 insertions(+), 4 deletions(-)
 rename plugins/CMakeListsCustom.txt => CMakeListsCustom.txt.example (99%)
 create mode 100644 cmake/modules/UseCustomIncludes.cmake
 rename epan/{CMakeListsCustom.txt => CMakeListsCustom.txt.example} (100%)
 rename ui/gtk/{CMakeListsCustom.txt => CMakeListsCustom.txt.example} (100%)