Wireshark · Wireshark-commits: [Wireshark-commits] master aad1a81: Fix out-of-tree build includes of config.h

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=aad1a81b99d4f65d5debf2b34f237081baef03a6
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

aad1a81 by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Fix out-of-tree build includes of config.h
    
    If a file in the same directory as config.h, e.g. wireshark-qt.cpp
    has a #include "config.h", or another header it includes also has
    a #include "config.h", then an out-of-tree build, e.g. CMake will
    pick up any in-tree config.h and odd things may happen.  The correct
    form is #include <config.h> which will pick up the out-of-tree
    version.
    
    To find this, introduce a deliberate error and then make an out-of-tree
    build, noting where it fails and fix that file.  If that file includes
    other files that still cause the build to fail, set the compiler
    to emit the pre-processed version so you can locate the include with
    the next errant "config.h".  Repeat ad nauseum.
    
    Possibly all includes of "config.h" should be changed to <config.h>
    
    Revert "CMake: Clobber the top-level config.h before we build."
    
    This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71.
    
    Ping-Bug: 10301
    Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341
    Reviewed-on: https://code.wireshark.org/review/6285
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  9384854   Use g_strdup_printf(), rather than a fixed-length buffer, for the app name.
    adds  aad1a81   Fix out-of-tree build includes of config.h


Summary of changes:
 CMakeLists.txt                         |   10 ----------
 codecs/codecs.h                        |    2 +-
 ui/qt/byte_view_tab.h                  |    2 +-
 ui/qt/capture_file.h                   |    2 +-
 ui/qt/capture_file_properties_dialog.h |    2 +-
 ui/qt/capture_interfaces_dialog.h      |    2 +-
 ui/qt/file_set_dialog.h                |    2 +-
 ui/qt/follow_stream_dialog.h           |    2 +-
 ui/qt/interface_tree.h                 |    2 +-
 ui/qt/main_window.h                    |    2 +-
 ui/qt/packet_list_model.h              |    2 +-
 ui/qt/packet_list_record.h             |    2 +-
 ui/qt/preferences_dialog.h             |    2 +-
 ui/qt/proto_tree.h                     |    2 +-
 ui/qt/related_packet_delegate.h        |    2 +-
 ui/qt/simple_dialog.h                  |    2 +-
 ui/qt/splash_overlay.h                 |    2 +-
 ui/qt/traffic_table_dialog.h           |    2 +-
 ui/qt/wireshark_application.h          |    2 +-
 wireshark-qt.cpp                       |    6 +++---
 20 files changed, 21 insertions(+), 31 deletions(-)