Wireshark-commits: [Wireshark-commits] master b14b048: CMake: Fix Vcpkg x86 directory discovery.
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: Fri, 18 Jan 2019 01:11:12 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b14b048a5e15baf6c3edd589097ad8f0f118f579
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

b14b048 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Fix Vcpkg x86 directory discovery.
    
    `vcpkg export` installs files into an architecture-dependent
    subdirectory which matches the PLATFORM environment variable on 64-bit
    Windows but not 32-bit Windows. Replace $ENV{PLATFORM} in FindWSWinLibs
    with a variable derived from WIRESHARK_TARGET_PLATFORM.
    
    Change-Id: I142615bd50179fdffdebd2bb1f193ef0070c0483
    Reviewed-on: https://code.wireshark.org/review/31582
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  ec17f61   Update tooltip for "Resolve network (IP) addresses"
     add  b14b048   CMake: Fix Vcpkg x86 directory discovery.


Summary of changes:
 cmake/modules/FindWSWinLibs.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)