Wireshark-commits: [Wireshark-commits] master 5614601: Update CMake build for win32 to build QT aga
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 8 Jun 2014 12:13:37 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=561460160a4ae73bda9b92751ae5c35d4324bb87
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5614601 by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Update CMake build for win32 to build QT again, and to find
    GLib and GThread libs
    
    Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a
    Reviewed-on: https://code.wireshark.org/review/2010
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  39cdb98   PEEKREMOTE packets don't appear to have Atheros padding.
    adds  5614601   Update CMake build for win32 to build QT again, and to find GLib and GThread libs


Summary of changes:
 CMakeLists.txt                    |   26 +++++++++++++++++---------
 CMakeOptions.txt                  |   19 ++++++++++++++++---
 README.cmake                      |    4 +++-
 cmake/modules/FindGLIB2.cmake     |   12 ++++++------
 cmake/modules/FindGTHREAD2.cmake  |   12 ++++++------
 cmake/modules/FindWSWinLibs.cmake |   17 +++++++++++++----
 6 files changed, 61 insertions(+), 29 deletions(-)