[Cmake-commits] CMake branch, master, updated. v2.8.12.1-633-gd592fc4

[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, master has been updated
       via  d592fc48cd24653ada365a3026e5d7f928955eb5 (commit)
       via  06b0dbe0614c08a8ec80ce69e7679b0faa7e69dc (commit)
       via  84af42b989fe919fee65fa0809d053a347d3f000 (commit)
       via  76550297b6670a6de24b6b58947234ce3ffb6746 (commit)
      from  558a6f1f920defdfcd7651fba3a85fded84d6a63 (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=d592fc48cd24653ada365a3026e5d7f928955eb5
commit d592fc48cd24653ada365a3026e5d7f928955eb5
Merge: 558a6f1 06b0dbe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 13 11:36:46 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 13 11:36:46 2013 -0500

    Merge topic 'cmake-distribution-config'
    
    06b0dbe OS X: Drop version number from CMake.app bundle name (#11693)
    84af42b Configure NSIS-packaged CMake version and install destination
    7655029 Configure NSIS-packaged CMake documentation link in Start Menu

diff --cc Source/QtDialog/CMakeLists.txt
index ee0b831,b17e212..f1f4649
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@@ -111,11 -111,8 +111,11 @@@ if(Qt_BIN_DIR
  endif()
  
  if(APPLE)
 +  file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
 +    LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
 +
    set_target_properties(cmake-gui PROPERTIES
-     OUTPUT_NAME ${CMAKE_BUNDLE_NAME}
+     OUTPUT_NAME CMake
      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}"

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

Summary of changes:
 CMakeCPack.cmake                 |   14 +++++---------
 CMakeCPackOptions.cmake.in       |    9 +--------
 CMakeLists.txt                   |    3 +--
 Source/QtDialog/CMakeLists.txt   |    8 ++++----
 Source/QtDialog/postflight.sh.in |    2 +-
 5 files changed, 12 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake