Wireshark-commits: [Wireshark-commits] master d2bb61a: OS X: Integrate CMake and osx-app.sh
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, 23 Oct 2014 15:52:56 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d2bb61a3a9ff29826aa332b7e4ee484f3a4746d9
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

d2bb61a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    OS X: Integrate CMake and osx-app.sh
    
    Add a -cb/--create-bundle option to osx-app.sh which builds the
    application bundle. Use it in Autotools. (CMake does this by default.)
    
    Copy over linker flags from configure.ac to CMakeLists.txt to support
    rpathification and code signing.
    
    Add an osx-app custom target to CMake.
    
    Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803
    Reviewed-on: https://code.wireshark.org/review/4918
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  97a920c   Don't free global_capture_opts.ifaces_err_info.
    adds  d2bb61a   OS X: Integrate CMake and osx-app.sh


Summary of changes:
 CMakeLists.txt              |   37 ++++
 Makefile.am                 |    4 +-
 packaging/macosx/osx-app.sh |  415 +++++++++++++++++++++++--------------------
 3 files changed, 259 insertions(+), 197 deletions(-)