Wireshark-commits: [Wireshark-commits] master-2.0 0223249: CMake+PortableApps: Include the VC runti
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, 3 Dec 2015 05:02:58 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0223249c8c74794a06ae76b29e12681ad5e3ebe4
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

0223249 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake+PortableApps: Include the VC runtime.
    
    Move the code that finds the Visual C++ redistributable DLLs to its
    own module. Run it before we create our NSIS and PortableApps targets.
    Add a PortableApps target that copies the redistributable.
    
    Bug: 11800
    Change-Id: I61aeac041386b17c8f3c1d2a8cfb7b210bf98f84
    Reviewed-on: https://code.wireshark.org/review/12390
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  0f98c6f   Qt: Set main window font when changing profile
    adds  0223249   CMake+PortableApps: Include the VC runtime.


Summary of changes:
 CMakeLists.txt                        |    2 ++
 Makefile.am                           |    1 +
 cmake/modules/FindNSIS.cmake          |    3 ---
 packaging/nsis/CMakeLists.txt         |   12 ------------
 packaging/portableapps/CMakeLists.txt |   18 +++++++++++++++---
 5 files changed, 18 insertions(+), 18 deletions(-)