Wireshark-commits: [Wireshark-commits] master 5440665: Fix building uiqt on Windows with the cmake

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, 18 Jun 2014 06:54:55 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=544066530b08f616fcdc7f16fe546acfa5a766a9
Submitter: J?rg Mayer (jmayer@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5440665 by Joerg Mayer (jmayer@xxxxxxxxx):

    Fix building uiqt on Windows with the cmake build system:
    Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt,
    maybe it doesn't have _WIN32 set?  Don't even try to detect this
    function on WIN32 for now.
    
    Change-Id: I0d8a8b5b110cec164f86fe11f26a7add558eee1b
    Reviewed-on: https://code.wireshark.org/review/2370
    Reviewed-by: Jörg Mayer <jmayer@xxxxxxxxx>
    

Actions performed:

    from  666127f   PDCP LTE: do not try to decipher PDCP control messages (like ROHC feedback)
    adds  5440665   Fix building uiqt on Windows with the cmake build system: Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt, maybe it doesn't have _WIN32 set?  Don't even try to detect this function on WIN32 for now.


Summary of changes:
 cmake/modules/FindPCAP.cmake |    6 +++++-
 cmakeconfig.h.in             |    4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)