Wireshark-commits: [Wireshark-commits] master-2.6 2d125c3: CMake+macOS: Allow the use of ENV{CMAKE_
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: Wed, 20 Jun 2018 18:21:20 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2d125c3f41144793c54f97e075f294c1e92db419
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

2d125c3 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake+macOS: Allow the use of ENV{CMAKE_PREFIX_PATH}.
    
    If we find /usr/local/opt/qt5, pass it as a PATHS option to find_package
    instead of adding it to the CMAKE_PREFIX_PATH CMake variable. This
    allows setting a Qt path via the CMAKE_PREFIX_PATH environment variable.
    
    Conflicts:
    	CMakeLists.txt
    
    Change-Id: I5d23fcd092c0ea137482253f3f86c1a6d27f7a5e
    Reviewed-on: https://code.wireshark.org/review/28341
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit ccd2512602913b6b89a98878cbcc16d6c6d3ee1c)
    Reviewed-on: https://code.wireshark.org/review/28351
    

Actions performed:

    from  8dd1aad   Better name for the routine.
    adds  2d125c3   CMake+macOS: Allow the use of ENV{CMAKE_PREFIX_PATH}.


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