From a377c7c38d97f177df237deb04af11a316e3f83f Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 18 Jan 2013 01:37:27 +0000 Subject: [PATCH] Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates. svn path=/trunk/; revision=47143 --- CMakeLists.txt | 8 ++++++++ packaging/macosx/Info.plist.in | 4 ++-- ui/qt/QtShark.pro | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6810dcbca6..495f0504b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -543,6 +543,14 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h) +set( configure_input "Built with ${CMAKE_COMMAND}" ) +set( VERSION ${PROJECT_VERSION} ) + +configure_file( + ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist.in + ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist + @ONLY) + include(FeatureSummary) #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ] #FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary diff --git a/packaging/macosx/Info.plist.in b/packaging/macosx/Info.plist.in index 19beb7a57f..bfb32b0242 100644 --- a/packaging/macosx/Info.plist.in +++ b/packaging/macosx/Info.plist.in @@ -9,7 +9,7 @@ CFBundleExecutable Wireshark CFBundleGetInfoString - @VERSION@, Copyright 1998-2012 Wireshark Development Team + @VERSION@, Copyright 1998-2013 Wireshark Development Team CFBundleIconFile Wireshark.icns CFBundleIdentifier @@ -62,7 +62,7 @@ CFBundleVersion @VERSION@ NSHumanReadableCopyright - Copyright 1998-2012 Wireshark Developers, GNU General Public License. + Copyright 1998-2013 Wireshark Developers, GNU General Public License. LSMinimumSystemVersion 10.3 diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index fa3bf6f5d3..d29c0315b9 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -32,8 +32,7 @@ QT += core gui TARGET = qtshark TEMPLATE = app -# XXX - Need to autogenerate Info.plist from Info.plist.in -# QMAKE_INFO_PLIST = ../../packaging/macosx/Info.plist +QMAKE_INFO_PLIST = ../../packaging/macosx/Info.plist xxx { message( )