diff options
| author | Gerald Combs <gerald@zing.org> | 2014-10-09 18:24:18 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-10 01:45:55 +0000 |
| commit | 3a4cab751ee59881f8ae0963dffc4ee82e36f085 (patch) | |
| tree | c3e378890c7c3716f3fb288d6d33f16f1737fa95 | |
| parent | 33d20c64dcc772118fd27f09a129a76416876beb (diff) | |
CMake: Bundle our libraries.
Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa
Reviewed-on: https://code.wireshark.org/review/4588
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | epan/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 6 |
3 files changed, 18 insertions, 1 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index df22998267..c9065c1ede 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1702,6 +1702,12 @@ set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(epan PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0) +if(ENABLE_APPLICATION_BUNDLE) + set_target_properties(epan PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks + ) +endif() + ABICHECK(libwireshark) file(GLOB COLUMN_INFO_HEADER column-info.h) diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index b2687f1300..571831fcbd 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -127,6 +127,12 @@ IF(MSVC) set_target_properties(wiretap PROPERTIES OUTPUT_NAME "wiretap-${PROJECT_VERSION}") ENDIF() +if(ENABLE_APPLICATION_BUNDLE) + set_target_properties(wiretap PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks + ) +endif() + ABICHECK(libwiretap) add_custom_command(OUTPUT libwiretap.abi.tar.gz @@ -145,4 +151,3 @@ if(NOT ${ENABLE_STATIC}) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif() - diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 0a3c1a969a..bf9ebfc1d8 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -145,6 +145,12 @@ set_target_properties(wsutil PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0 FOLDER "DLLs") +if(ENABLE_APPLICATION_BUNDLE) + set_target_properties(wsutil PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks + ) +endif() + ABICHECK(libwsutil) add_custom_command(OUTPUT libwsutil.abi.tar.gz |