[Cmake-commits] CMake branch, next, updated. v3.1.0-1229-gefb496d

[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  efb496dcefde4cd2114375cd363ae4580624cff4 (commit)
       via  f90335ea40766480abe30239d723b58b2a49cdcc (commit)
       via  2a45da6ea4ea2548258ef550afb3dd3cf1475b4f (commit)
      from  7e6d0eed6a86bf798eff158ac3f234b09bbbb0c1 (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=efb496dcefde4cd2114375cd363ae4580624cff4
commit efb496dcefde4cd2114375cd363ae4580624cff4
Merge: 7e6d0ee f90335e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 09:16:25 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 09:16:25 2014 -0500

    Merge topic 'osx-release-binary-name' into next
    
    f90335ea Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
    2a45da6e CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f90335ea40766480abe30239d723b58b2a49cdcc
commit f90335ea40766480abe30239d723b58b2a49cdcc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 09:13:44 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 18 09:15:40 2014 -0500

    Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
    
    In commit v3.1.0-rc1~52^2 (Make the OSX 10.6+ release x86_64 only,
    2014-09-29) we forgot to remove the name "universal" from the binary
    name.  Drop it now since the binary is no longer universal.
    
    While at it, update the deployment target to actually be 10.6.

diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index 6c9b8f4..0822a1c 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -15,9 +15,9 @@ OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
 OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a
 CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_OSX_ARCHITECTURES:STRING=x86_64
-CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
+CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-CPACK_SYSTEM_NAME:STRING=Darwin64-universal
+CPACK_SYSTEM_NAME:STRING=Darwin64
 BUILD_QtDialog:BOOL=TRUE
 CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
 QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/install/bin/qmake

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

Summary of changes:
 Source/CMakeVersion.cmake                    |    2 +-
 Utilities/Release/dashmacmini5_release.cmake |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake