Wireshark-commits: [Wireshark-commits] master a19825b: CMake: Use WIRESHARK_LIB_DIR. Fix GThread ch
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: Mon, 20 Oct 2014 23:42:14 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a19825b45dad112edfa565369d8d31a36bf47817
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

a19825b by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.
    
    Have FindWSWinLibs check for WIRESHARK_LIB_DIR before WIRESHARK_BASE_DIR
    to match the behavior of config.nmake and the Windows buildbots, which
    set the former but not the latter.
    
    It looks like the latest GLib DLL contains GThread. Adjust
    FindGTHREAD2.cmake accordingly.
    
    Change-Id: I0232b1819eca9ba2c39ae6834daddf65af979d7d
    Reviewed-on: https://code.wireshark.org/review/4887
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  f66e45b   Export cf_set_frame_edited().
    adds  a19825b   CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.


Summary of changes:
 README.cmake                      |   10 +++++++---
 cmake/modules/FindGTHREAD2.cmake  |   13 +++++++++----
 cmake/modules/FindWSWinLibs.cmake |   11 ++++++++---
 3 files changed, 24 insertions(+), 10 deletions(-)