Wireshark-commits: [Wireshark-commits] master-2.0 5b58083: 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: Fri, 4 Dec 2015 18:10:25 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5b580834aeeee8477039bc099c49c21aeeb3b71f
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

5b58083 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake+PortableApps: Include the VC runtime (second try).
    
    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
    
    This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4.
    
    Bug: 11800
    Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df
    Reviewed-on: https://code.wireshark.org/review/12431
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  6cd2e4c   Qt: fix a potential memory leak in RTP audio stream playback
    adds  5b58083   CMake+PortableApps: Include the VC runtime (second try).


Summary of changes:
 CMakeLists.txt                        |    2 ++
 Makefile.am                           |    1 +
 cmake/modules/FindMSVC_REDIST.cmake   |   23 +++++++++++++++++++++++
 cmake/modules/FindNSIS.cmake          |    3 ---
 packaging/nsis/CMakeLists.txt         |   12 ------------
 packaging/portableapps/CMakeLists.txt |   19 ++++++++++++++++---
 6 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 cmake/modules/FindMSVC_REDIST.cmake