Wireshark · Wireshark-commits: [Wireshark-commits] master-2.6 f28f804: CMake: Don't bundle our libraries at compile time.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f28f8049f78590e4d6e5a8810e714d20c44e155e
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

f28f804 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Don't bundle our libraries at compile time.
    
    Setting LIBRARY_OUTPUT_DIRECTORY to Wireshark.app/Contents/Frameworks
    for each of our libraries ends up installing a fully versioned .dylib
    along with soversion and unversioned symlinks, which is more than we
    want and which wastes disk space when osx-app.sh dsymifies our
    libraries.
    
    Leave LIBRARY_OUTPUT_DIRECTORY unset and depend on osx-app.sh to copy
    our libraries into place.
    
    Conflicts:
    	codecs/CMakeLists.txt
    	epan/CMakeLists.txt
    	wiretap/CMakeLists.txt
    	wsutil/CMakeLists.txt
    
    Bug: 15361
    Change-Id: If0fbaa796b4be806e2aa13887e511a330fe55df5
    Reviewed-on: https://code.wireshark.org/review/31139
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 25e1e2c8489e46e539e51c780e3d58e0f1df8104)
    Reviewed-on: https://code.wireshark.org/review/31156
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  ac9d225   ANSI MAP: borderCellAccess parameter coded as tag 50 but should be 58.
     add  f28f804   CMake: Don't bundle our libraries at compile time.


Summary of changes:
 CMakeLists.txt         | 3 +++
 codecs/CMakeLists.txt  | 6 ------
 epan/CMakeLists.txt    | 6 ------
 wiretap/CMakeLists.txt | 6 ------
 wsutil/CMakeLists.txt  | 6 ------
 5 files changed, 3 insertions(+), 24 deletions(-)