[Cmake-commits] CMake branch, next, updated. v2.8.12-3716-g1e1e272

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1e1e272d3aac3262d49d045678f7fb1ecfa54ec1 (commit)
       via  dcf1b645691a1d31cbbad78a9c6c9dca8d472346 (commit)
      from  c92ced87277375154760873b1b7949235b035855 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e1e272d3aac3262d49d045678f7fb1ecfa54ec1
commit 1e1e272d3aac3262d49d045678f7fb1ecfa54ec1
Merge: c92ced8 dcf1b64
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 12:36:49 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 8 12:36:49 2013 -0400

    Merge topic 'osx-cmake-app-info-plist' into next
    
    dcf1b64 OS X: Set CMake.app bundle Info.plist fields (#11694)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf1b645691a1d31cbbad78a9c6c9dca8d472346
commit dcf1b645691a1d31cbbad78a9c6c9dca8d472346
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 12:32:28 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 12:32:28 2013 -0400

    OS X: Set CMake.app bundle Info.plist fields (#11694)
    
    Use the Apple Info.plist reference documentation:
    
     Core Foundation Keys
     https://developer.apple.com/library/mac/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
    
     Launch Services Keys
     https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html
    
     Cocoa Keys
     https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html
    
    modify the Info.plist we create for cmake-gui to add/set fields
    
     CFBundleShortVersionString = The release-version-number string
     LSApplicationCategoryType  = UTI that categorizes the app for the App Store
     NSHumanReadableCopyright   = Specifies the copyright notice
    
    and drop fields
    
     CFBundleGetInfoString
     CFBundleLongVersionString
     LSRequiresCarbon
    
    Also prepare to set
    
     CFBundleVersion            = The build-version-number string
    
    but leave it commented out as TBD (To Be Determined) for now.
    
    The version fields must have form <major>.<minor>.<patch> with integer
    components.  While at it, rename the bundle to end in ".<patch>" instead
    of "-<patch>" so that it is consistent with the version number and does
    not look like a packaging increment suffix.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fbbe08..3ff65d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -529,8 +529,9 @@ endif()
 
 if(BUILD_QtDialog)
   if(APPLE)
-    set(CMAKE_BUNDLE_NAME
-      "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
+    set(CMAKE_BUNDLE_VERSION
+      "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
+    set(CMAKE_BUNDLE_NAME "CMake ${CMAKE_BUNDLE_VERSION}")
     set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
     # make sure CMAKE_INSTALL_PREFIX ends in /
     string(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index ef25294..15f9ef1 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -112,7 +112,12 @@ endif()
 
 if(APPLE)
   set_target_properties(cmake-gui PROPERTIES
-    OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
+    OUTPUT_NAME ${CMAKE_BUNDLE_NAME}
+    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
+    MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
+    # TBD: MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"
+    MACOSX_BUNDLE_COPYRIGHT "Copyright 2000-2013 Kitware, Inc."
+    )
 endif()
 set(CMAKE_INSTALL_DESTINATION_ARGS
   BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
diff --git a/Source/QtDialog/Info.plist.in b/Source/QtDialog/Info.plist.in
new file mode 100644
index 0000000..b9c4af5
--- /dev/null
+++ b/Source/QtDialog/Info.plist.in
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+</dict>
+</plist>

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                                     |    5 +++--
 Source/QtDialog/CMakeLists.txt                     |    7 ++++++-
 .../QtDialog/Info.plist.in                         |    8 ++------
 3 files changed, 11 insertions(+), 9 deletions(-)
 copy Modules/MacOSXBundleInfo.plist.in => Source/QtDialog/Info.plist.in (83%)


hooks/post-receive
-- 
CMake