Wireshark-commits: [Wireshark-commits] master 54286eb: FindGLIB2.cmake: workaround to make static l
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: Thu, 18 Oct 2018 20:06:23 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=54286eb09cca14f0931f094c3f4874a2701729a6
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

54286eb by Peter Wu (peter@xxxxxxxxxxxxx):

    FindGLIB2.cmake: workaround to make static linking work
    
    When using pkg_search_module(GLIB2 glib-2.0), it will also include
    transitive dependencies (pcre) in GLIB2_STATIC_LIBRARIES, but it will
    still lack -pthread (which is in GLIB2_STATIC_LDFLAGS). For simplicity
    just hardcode these.
    
    Change-Id: Ia227f8b56e088c71210a748aeb2dedaba521c090
    Reviewed-on: https://code.wireshark.org/review/30252
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  e6e2137   cmake: rewrite FindGMODULE2.cmake and FindGTHREAD2.cmake
     add  54286eb   FindGLIB2.cmake: workaround to make static linking work


Summary of changes:
 cmake/modules/FindGLIB2.cmake | 5 +++++
 1 file changed, 5 insertions(+)