Wireshark-commits: [Wireshark-commits] master 408ea5d: cmake: do not fail if help/faq.txt already e

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: Wed, 30 Dec 2015 00:44:37 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=408ea5d2fa5a786e910264bdd662fff0a0822497
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

408ea5d by Peter Wu (peter@xxxxxxxxxxxxx):

    cmake: do not fail if help/faq.txt already exists
    
    The glob pattern should not catch the generated faq.txt file. Fix this
    by explicitly listing all source .txt files.
    
    Bug: 11896
    Change-Id: I3904a0e094b5dba3808dacaaabd4db298a8f14cb
    Reviewed-on: https://code.wireshark.org/review/12930
    Reviewed-by: Jörg Mayer <jmayer@xxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    

Actions performed:

    from  39559b1   ZigBee NWK: fix Info column for NWK Rejoin Resp.
    adds  408ea5d   cmake: do not fail if help/faq.txt already exists


Summary of changes:
 CMakeLists.txt |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)