[Cmake-commits] CMake branch, next, updated. v3.0.2-5495-g7dd7436

Robert Maynard robert.maynard at kitware.com
Mon Sep 29 10:02:41 EDT 2014


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  7dd7436d6323304bc9b838267a6f5c180434943b (commit)
       via  3da328d38fda55f1683c4e033f17366493305349 (commit)
      from  9a25aaa24c16822e363ff15445c4a536156695e4 (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=7dd7436d6323304bc9b838267a6f5c180434943b
commit 7dd7436d6323304bc9b838267a6f5c180434943b
Merge: 9a25aaa 3da328d
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Sep 29 10:02:40 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 29 10:02:40 2014 -0400

    Merge topic 'build_cmake_dmg_non_universal' into next
    
    3da328d3 Make the OSX 10.6+ release x86_64 only.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3da328d38fda55f1683c4e033f17366493305349
commit 3da328d38fda55f1683c4e033f17366493305349
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Sep 29 10:00:57 2014 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Sep 29 10:00:57 2014 -0400

    Make the OSX 10.6+ release x86_64 only.
    
    We have no need for the 10.6+ bundle to be 32 and 64bit. For older 32bit
    machines they should be using the 10.4+ 32bit release.

diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index d332816..6c9b8f4 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -14,7 +14,7 @@ OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcry
 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;i386
+CMAKE_OSX_ARCHITECTURES:STRING=x86_64
 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CPACK_SYSTEM_NAME:STRING=Darwin64-universal

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

Summary of changes:
 Utilities/Release/dashmacmini5_release.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list