Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master 7b5e774: CMake: Update FindWiX.

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 5 Dec 2016 20:21:46 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7b5e77406d5210489c82a7aa9312053ccb030766
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

7b5e774 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Update FindWiX.
    
    The WiX Toolset installer sets the WIX environment variable. Search for
    our WiX executables there first.
    
    Change-Id: I5acc9cb369dc2bdbb071d35b5a39498c6db117a3
    Reviewed-on: https://code.wireshark.org/review/19096
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  2b51717   RTPS: Added submessages and fixed minor issues for Secure DDS
    adds  7b5e774   CMake: Update FindWiX.


Summary of changes:
 cmake/modules/FindWiX.cmake |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)