Wireshark-commits: [Wireshark-commits] master 37790e9: cmake: fix empty data (Global Configuration)

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 10 Jan 2017 17:09:58 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=37790e90f52b4c08d2a5dd8c4ff0e0cab4913880
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

37790e9 by Peter Wu (peter@xxxxxxxxxxxxx):

    cmake: fix empty data (Global Configuration) directory
    
    Color filters were somehow not loaded. It turns out that the
    BUILD_TIME_DATAFILE_DIR macro (for filesystem.c) was empty because
    DATAFILE_DIR was defined after adding the wsutil directory. Fix it by
    defining the variable before wsutil (but after epan).
    
    Change-Id: I0d002b79499c80a90d8fcc14b06ced26c30b0453
    Fixes: v2.3.0rc0-1830-gd5fdbef7f4 ("cmake,wslua,wsutil: load files from run/ instead of source tree")
    Reviewed-on: https://code.wireshark.org/review/19600
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  0ecfc72   Use tvb_new_subset_remaining() rather than tvb_new_subset_length_caplen().
    adds  37790e9   cmake: fix empty data (Global Configuration) directory


Summary of changes:
 CMakeLists.txt |   29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)