Wireshark-commits: [Wireshark-commits] master 17604f1: CMake+macOS: Make sure we're using the right
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 21 Jun 2018 03:32:38 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=17604f15a1a1fe4199449150675c2613874ae4a5
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

17604f1 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake+macOS: Make sure we're using the right Qt tools.
    
    Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the
    corresponding path to macdeployqt and use those in osx-app.sh.
    
    Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee
    Reviewed-on: https://code.wireshark.org/review/28359
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  7f77259   NR RRC: upgrade dissector to v15.2.0
    adds  17604f1   CMake+macOS: Make sure we're using the right Qt tools.


Summary of changes:
 CMakeLists.txt                 | 74 +++++++++++++++++++++++-------------------
 packaging/macosx/osx-app.sh.in |  4 +--
 2 files changed, 42 insertions(+), 36 deletions(-)