Wireshark-commits: [Wireshark-commits] master-2.6 8fa43f1: macOS: Make sure we package our own libr

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: Fri, 21 Dec 2018 17:41:58 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8fa43f1223d537cbc3237c3da605895b32659324
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

8fa43f1 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    macOS: Make sure we package our own libraries.
    
    As of 25e1e2c848 we no longer set LIBRARY_OUTPUT_DIRECTORY to
    Wireshark.app/Contents/Frameworks. As a result we need to copy them into
    place during our packaging process.
    
    Conflicts:
    	packaging/macosx/osx-app.sh.in
    
    Change-Id: Idbdea289dce60e9acf9ab317f4151bfe2c993ddd
    Reviewed-on: https://code.wireshark.org/review/31160
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit a1ef5f6899afafe650b9013a8d36613b614b1f3f)
    Reviewed-on: https://code.wireshark.org/review/31161
    

Actions performed:

    from  f28f804   CMake: Don't bundle our libraries at compile time.
     add  8fa43f1   macOS: Make sure we package our own libraries.


Summary of changes:
 packaging/macosx/osx-app.sh.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)