[Cmake-commits] CMake branch, next, updated. v3.1.0-1289-g8a1b7e7
Brad King
brad.king at kitware.com
Fri Dec 19 12:09:12 EST 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 8a1b7e7f4783873b0ed3bbfaf2a29b33afe86940 (commit)
via 8ca0c618392153ed9a908563c7bb97b322ea208e (commit)
from 1645a8f6112ede0c970cf179d3b618d3f7091cb5 (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=8a1b7e7f4783873b0ed3bbfaf2a29b33afe86940
commit 8a1b7e7f4783873b0ed3bbfaf2a29b33afe86940
Merge: 1645a8f 8ca0c61
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 19 12:09:11 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 19 12:09:11 2014 -0500
Merge topic 'nightly-binary-updates' into next
8ca0c618 Utilities/Release: Change OS X 10.6+ binary name to use x86_64
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ca0c618392153ed9a908563c7bb97b322ea208e
commit 8ca0c618392153ed9a908563c7bb97b322ea208e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 19 12:08:50 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 19 12:08:55 2014 -0500
Utilities/Release: Change OS X 10.6+ binary name to use x86_64
This makes the pattern consistent with the other platforms.
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index b2f1ceb..910fcbd 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -22,7 +22,7 @@ CMAKE_BUILD_TYPE:STRING=Release
CMAKE_OSX_ARCHITECTURES:STRING=x86_64
CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-CPACK_SYSTEM_NAME:STRING=Darwin64
+CPACK_SYSTEM_NAME:STRING=Darwin-x86_64
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:
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