Wireshark-commits: [Wireshark-commits] master 528a857: Fix CMake generation and use of Windows .rc

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: Sun, 11 Jan 2015 20:22:35 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=528a8572582116a93e660ca93cdee36809b13b96
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

528a857 by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Fix CMake generation and use of Windows .rc files
    
    CMake now generates local copies of .rc files for all the Windows
    components and uses the files in the build of the components.
    
    The .rc.in files that include an icon were modified to allow the icon
    path to be set by CMake.  The path is removed for nmake builds.
    
    Updated build architecture detection, required for wireshark.manifest.in
    
    Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
    Reviewed-on: https://code.wireshark.org/review/6482
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    

Actions performed:

    from  7d004dc   Revert "Lemon: Update lemon tools"
    adds  528a857   Fix CMake generation and use of Windows .rc files


Summary of changes:
 CMakeLists.txt                     |   57 +++++++++++++++++-------------------
 cmakeconfig.h.in                   |    4 ++-
 epan/CMakeLists.txt                |    2 +-
 image/Makefile.nmake               |   11 +++++++
 image/capinfos.rc.in               |    2 +-
 image/captype.rc.in                |    2 +-
 image/dumpcap.rc.in                |    2 +-
 image/editcap.rc.in                |    2 +-
 image/mergecap.rc.in               |    2 +-
 image/rawshark.rc.in               |    2 +-
 image/reordercap.rc.in             |    2 +-
 image/text2pcap.rc.in              |    2 +-
 image/tfshark.rc.in                |    2 +-
 image/tshark.rc.in                 |    2 +-
 image/wireshark.rc.in              |    4 +--
 plugins/docsis/CMakeLists.txt      |   27 ++++++++++++++++-
 plugins/docsis/plugin.rc.in        |    2 +-
 plugins/easy_codec/ReadMe.txt      |    1 +
 plugins/easy_codec/plugin.rc.in    |    2 +-
 plugins/ethercat/CMakeLists.txt    |   26 +++++++++++++++-
 plugins/ethercat/plugin.rc.in      |    2 +-
 plugins/gryphon/CMakeLists.txt     |   26 +++++++++++++++-
 plugins/gryphon/plugin.rc.in       |    2 +-
 plugins/irda/CMakeLists.txt        |   26 +++++++++++++++-
 plugins/irda/plugin.rc.in          |    2 +-
 plugins/m2m/CMakeLists.txt         |   26 +++++++++++++++-
 plugins/m2m/plugin.rc.in           |    2 +-
 plugins/mate/CMakeLists.txt        |   26 +++++++++++++++-
 plugins/mate/plugin.rc.in          |    2 +-
 plugins/opcua/CMakeLists.txt       |   23 ++++++++++++++-
 plugins/opcua/plugin.rc.in         |    2 +-
 plugins/profinet/CMakeLists.txt    |   26 +++++++++++++++-
 plugins/profinet/plugin.rc.in      |    2 +-
 plugins/stats_tree/CMakeLists.txt  |   26 +++++++++++++++-
 plugins/stats_tree/plugin.rc.in    |    2 +-
 plugins/unistim/CMakeLists.txt     |   23 ++++++++++++++-
 plugins/wimax/CMakeLists.txt       |   26 +++++++++++++++-
 plugins/wimax/plugin.rc.in         |    2 +-
 plugins/wimaxasncp/CMakeLists.txt  |   26 +++++++++++++++-
 plugins/wimaxasncp/plugin.rc.in    |    2 +-
 plugins/wimaxmacphy/CMakeLists.txt |   26 +++++++++++++++-
 plugins/wimaxmacphy/plugin.rc.in   |    2 +-
 wiretap/CMakeLists.txt             |    2 +-
 wsutil/CMakeLists.txt              |    2 +-
 44 files changed, 390 insertions(+), 72 deletions(-)