CMake: Bundle our libraries.

Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa Reviewed-on: https://code.wireshark.org/review/4588 Reviewed-by: Gerald Combs <gerald@wireshark.org>
network-analytics · Oct 10, 2014 · 3a4cab7 · 3a4cab7
1 parent 33d20c6
commit 3a4cab7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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