Wireshark-commits: [Wireshark-commits] master-2.0 0fdce24: cmake: fix build with cmake 2.8.7
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: Fri, 26 Aug 2016 08:59:22 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0fdce2486e53e1fba36db5ee3dd11312cd480ba2
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

0fdce24 by Peter Wu (peter@xxxxxxxxxxxxx):

    cmake: fix build with cmake 2.8.7
    
    Generator expression TARGET_OBJECTS was added in cmake 2.8.8 which
    cannot be used here. Just reference the files from add_library directly
    for non-Windows since this workaround is only needed for MSVC.
    
    Change-Id: I1608532bc7e2e445539f3ffd39950cd3c0b60e5a
    Fixes: 9412cc17bc ("CORBA IDL: compile dissectors with /Ox when using MSVC2013 x64")
    Reviewed-on: https://code.wireshark.org/review/17269
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  83e248c   xmpp/xml: Store item length in xml_frame.
    adds  0fdce24   cmake: fix build with cmake 2.8.7


Summary of changes:
 epan/CMakeLists.txt |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)