aboutsummaryrefslogtreecommitdiffstats
path: root/CPackConfig.txt
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-10-09 11:37:27 -0700
committerGerald Combs <gerald@wireshark.org>2014-10-09 20:07:48 +0000
commite00ac05cf33f8ec13b042d51e85355d39f7e113e (patch)
treece3fc3555f3973461dac7981869251ea4f0f0d43 /CPackConfig.txt
parent58cc452d6f3fd6e9b3441796574fdd50e9565257 (diff)
CMake: Build an application bundle (Wireshark.app) on OS X.
Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CPackConfig.txt')
-rw-r--r--CPackConfig.txt18
1 files changed, 7 insertions, 11 deletions
diff --git a/CPackConfig.txt b/CPackConfig.txt
index 25790ade0b..cec48646d1 100644
--- a/CPackConfig.txt
+++ b/CPackConfig.txt
@@ -44,17 +44,13 @@ set(CPACK_GENERATOR "TBZ2")
set(CPACK_SOURCE_GENERATOR "TBZ2")
#===============================================
-# IF(APPLE)
-# SET(CPACK_GENERATOR "${CPACK_GENERATOR};Bundle")
-# SET(CPACK_BUNDLE_ICON "${OBDGPSLogger_SOURCE_DIR}/osx/BundleIcon.icns")
-# SET(CPACK_BUNDLE_NAME "OBD GPS Logger")
-# SET(CPACK_BUNDLE_PLIST "${OBDGPSLogger_SOURCE_DIR}/osx/Info.plist")
-# SET(CPACK_BUNDLE_STARTUP_COMMAND "${OBDGPSLogger_SOURCE_DIR}/osx/StartupCommand")
-#
-# IF(GPSD_DAEMON)
-# INSTALL(PROGRAMS ${GPSD_DAEMON}
-# DESTINATION sbin/)
-# ENDIF(GPSD_DAEMON)
+IF(APPLE)
+ SET(CPACK_GENERATOR "${CPACK_GENERATOR};DragNDrop")
+ SET(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/packaging/macosx/Resources/Wireshark.icns")
+ SET(CPACK_BUNDLE_NAME "Wireshark")
+ SET(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/packaging/macosx/Info.plist")
+# SET(CPACK_BUNDLE_STARTUP_COMMAND "${OBDGPSLogger_SOURCE_DIR}/osx/StartupCommand")
+ENDIF(APPLE)
# ELSE(APPLE)
#
# # If we can find rpmbuild, then go for it