forked from osmocom/wireshark
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>
This commit is contained in:
parent
9d552b83e7
commit
25e1e2c848
|
@ -2137,6 +2137,9 @@ if(ENABLE_APPLICATION_BUNDLE)
|
||||||
"-Wl,-headerpad_max_install_names -Wl,-search_paths_first ${CMAKE_EXE_LINKER_FLAGS}"
|
"-Wl,-headerpad_max_install_names -Wl,-search_paths_first ${CMAKE_EXE_LINKER_FLAGS}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Create our Frameworks directory
|
||||||
|
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/Wireshark.app/Contents/Frameworks")
|
||||||
|
|
||||||
# Add files to the app bundle
|
# Add files to the app bundle
|
||||||
# Wireshark.app/Contents
|
# Wireshark.app/Contents
|
||||||
file(WRITE ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo "APPLWshk\n")
|
file(WRITE ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo "APPLWshk\n")
|
||||||
|
|
|
@ -62,22 +62,6 @@ set_target_properties(wscodecs PROPERTIES
|
||||||
FOLDER "DLLs"
|
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})
|
target_link_libraries(wscodecs ${wscodecs_LIBS})
|
||||||
|
|
||||||
install(TARGETS wscodecs
|
install(TARGETS wscodecs
|
||||||
|
|
|
@ -295,19 +295,6 @@ set_target_properties(epan PROPERTIES
|
||||||
VERSION "0.0.0" SOVERSION 0
|
VERSION "0.0.0" SOVERSION 0
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_APPLICATION_BUNDLE)
|
|
||||||
if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
|
|
||||||
# Xcode
|
|
||||||
set_target_properties(epan PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/Frameworks
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
set_target_properties(epan PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
ABICHECK(libwireshark)
|
ABICHECK(libwireshark)
|
||||||
|
|
||||||
set(TOP_LEVEL_HEADERS ${CMAKE_BINARY_DIR}/config.h)
|
set(TOP_LEVEL_HEADERS ${CMAKE_BINARY_DIR}/config.h)
|
||||||
|
|
|
@ -121,19 +121,6 @@ set_target_properties(wiretap PROPERTIES
|
||||||
FOLDER "DLLs"
|
FOLDER "DLLs"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_APPLICATION_BUNDLE)
|
|
||||||
if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
|
|
||||||
# Xcode
|
|
||||||
set_target_properties(wiretap PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/Frameworks
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
set_target_properties(wiretap PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
ABICHECK(libwiretap)
|
ABICHECK(libwiretap)
|
||||||
|
|
||||||
add_custom_command(OUTPUT libwiretap.abi.tar.gz
|
add_custom_command(OUTPUT libwiretap.abi.tar.gz
|
||||||
|
|
|
@ -249,20 +249,6 @@ set_target_properties(wsutil PROPERTIES
|
||||||
FOLDER "DLLs"
|
FOLDER "DLLs"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_APPLICATION_BUNDLE)
|
|
||||||
|
|
||||||
if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
|
|
||||||
# Xcode
|
|
||||||
set_target_properties(wsutil PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/Frameworks
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
set_target_properties(wsutil PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
ABICHECK(libwsutil)
|
ABICHECK(libwsutil)
|
||||||
|
|
||||||
add_custom_command(OUTPUT libwsutil.abi.tar.gz
|
add_custom_command(OUTPUT libwsutil.abi.tar.gz
|
||||||
|
|
Loading…
Reference in New Issue