diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-12-19 16:46:40 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-12-20 20:34:39 +0000 |
| commit | 25e1e2c8489e46e539e51c780e3d58e0f1df8104 (patch) | |
| tree | fcd288b320aa08c4d6db8b4ecd36fcbe96da3549 /codecs | |
| parent | 9d552b83e7062d823aba51a361d9110dd8a13d00 (diff) | |
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.
Bug: 15361
Change-Id: If0fbaa796b4be806e2aa13887e511a330fe55df5
Reviewed-on: https://code.wireshark.org/review/31139
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/CMakeLists.txt | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt index 9d912461a5..54e1eec77f 100644 --- a/codecs/CMakeLists.txt +++ b/codecs/CMakeLists.txt @@ -62,22 +62,6 @@ set_target_properties(wscodecs PROPERTIES FOLDER "DLLs" ) -if(ENABLE_APPLICATION_BUNDLE) - set_target_properties(wscodecs PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks - ) - if(NOT CMAKE_CFG_INTDIR STREQUAL ".") - # Xcode - set_target_properties(wscodecs PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/Frameworks - ) - else() - set_target_properties(wscodecs PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks - ) - endif() -endif() - target_link_libraries(wscodecs ${wscodecs_LIBS}) install(TARGETS wscodecs |