[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=883ab43d5671b75b2469b82fb9b6feae08aa50d8
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

883ab43 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Don't build Windows package targets by default.
    
    Explicitly exclude our various Windows package targets from the Visual
    Studio default build. This will hopefully keep the 32-bit Windows builder
    from trying to build the portableapps_runtime target when it shouldn't.
    
    Conflicts:
    	packaging/nsis/CMakeLists.txt
    	packaging/wix/CMakeLists.txt
    
    Change-Id: Id8481e92abda9b1a4784b8c8e8b5a1b3f1b4647e
    Reviewed-on: https://code.wireshark.org/review/32256
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit a0c93f426b0bb3510af3e4657d95bd64e46ed5f8)
    Reviewed-on: https://code.wireshark.org/review/32266
    

Actions performed:

    from  34ed0ba   Fix a comment.
     add  883ab43   CMake: Don't build Windows package targets by default.


Summary of changes:
 packaging/nsis/CMakeLists.txt         | 10 ++++++++--
 packaging/portableapps/CMakeLists.txt | 15 ++++++++++++---
 packaging/wix/CMakeLists.txt          | 10 ++++++++--
 3 files changed, 28 insertions(+), 7 deletions(-)