Wireshark-commits: [Wireshark-commits] master 6f2d4c2: Wix: Look for merge modules in %VCToolsRedis

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, 14 Feb 2018 05:31:25 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6f2d4c27126f3d1a73494ceafc464df99e081494
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

6f2d4c2 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Wix: Look for merge modules in %VCToolsRedistDir%.
    
    Add "%VCToolsRedistDir%\MergeModules" to the merge module search path.
    This is required for Visual Studio 2017 here.
    
    Change-Id: I91cd1527ae80c85ed304c1233436cae52aa0a501
    Reviewed-on: https://code.wireshark.org/review/25782
    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  944e661   OpenFlow 1.5: add extra property length checks
    adds  6f2d4c2   Wix: Look for merge modules in %VCToolsRedistDir%.


Summary of changes:
 packaging/wix/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)