From e4eecc5215b8c6521931a15951b71a522ba826bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Sat, 15 May 2010 20:41:53 +0000
Subject: - Move cmake options into their own file, making it easier to   use a
 locally modified version of the stuff - Some (still preliminary) CPack
 changes - Add -fexcess-precision=fast (configure.in and CmakeLists.txt)   to
 the compileflags (new gcc-4.5 feature to maintain backward   compatibility
 with gcc-4.4 and IMO we don't need the slower but   more exact implementation
 gcc 4.5 offers.

svn path=/trunk/; revision=32823
---
 CPackConfig.txt | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

(limited to 'CPackConfig.txt')

diff --git a/CPackConfig.txt b/CPackConfig.txt
index afb7f69698..8bdab476ab 100644
--- a/CPackConfig.txt
+++ b/CPackConfig.txt
@@ -22,14 +22,19 @@
 #
 
 set(CPACK_PACKAGE_NAME wireshark)
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet")
-set(CPACK_PACKAGE_VENDOR "wireshark")
+set(CPACK_PACKAGE_DESCRIPTION "A set of command line and gui tools to capture and decode traffic")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Packet capturing and decoding")
+set(CPACK_PACKAGE_VENDOR "Wireshark developers")
+set(CPACK_PACKAGE_NAME "wireshark")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_MAJOR_VERSION}")
 set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_MINOR_VERSION}")
 set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
 set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+set(CPACK_PACKAGE_CONTACT "wireshark-users@wireshark.org")
+# set(CPACK_PACKAGE_EXECUTABLES "wireshark")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_STRIP_FILES true)
 
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
@@ -40,3 +45,41 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
 set(CPACK_GENERATOR "TGZ")
 #set(CPACK_SOURCE_GENERATOR "TGZ")
 
+#===============================================
+# 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)
+# ELSE(APPLE)
+#
+#         # If we can find rpmbuild, then go for it
+#         FIND_PROGRAM(RPMBUILD_TEST rpmbuild INTERNAL)
+#         IF(RPMBUILD_TEST)
+#                 SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
+#                 SET(CPACK_RPM_PACKAGE_REQUIRES "gpsd >= 2.0")
+#                 SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2+")
+#         ENDIF(RPMBUILD_TEST)
+#
+#         # If we can find dpkg, build a .deb
+#         #FIND_PROGRAM(DPKG_TEST dpkg INTERNAL)
+#         #IF(DPKG_TEST)
+#                 SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
+#                 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "gpsd (>=2.0)")
+#                 SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
+#         #ENDIF(DPKG_TEST)
+#
+# ENDIF(APPLE)
+#
+#
+#
+#===============================================
+
+include(CPack)
+
-- 
cgit v1.2.3