CMake: Bundle our libraries.

Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa
Reviewed-on: https://code.wireshark.org/review/4588
Reviewed-by: Gerald Combs <gerald@wireshark.org>

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index df229982677e7e3c4eae4c7d65f56aad9a4bb625..c9065c1ededd8511002a232e93fb71549198afc7 100644 (file)
--- 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 b2687f1300cac63be9d7c5ee7ba38b75660c74b2..571831fcbd4cf6d3ceced3baf4fdd3691d67ea2c 100644 (file)
--- 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 0a3c1a969a1d232bbe444c1eb859e37c2edd5c23..bf9ebfc1d8962a00b683cfee2a10ce2b120ce116 100644 (file)
--- 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