[Cmake-commits] CMake branch, next, updated. v3.5.2-1274-g1cf5b19
Brad King
brad.king at kitware.com
Fri May 6 13:37:30 EDT 2016
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 1cf5b19d13c76ff10633e3240d9c07d98c1ba775 (commit)
via ea8428a2f4a26848e2712c8b85f479e5a22c13dc (commit)
from 366d21521891faf231afbe4e1fdcd057d80dca37 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cf5b19d13c76ff10633e3240d9c07d98c1ba775
commit 1cf5b19d13c76ff10633e3240d9c07d98c1ba775
Merge: 366d215 ea8428a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 6 13:37:29 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 6 13:37:29 2016 -0400
Merge topic 'update-osx-release' into next
ea8428a2 Utilities/Release: Switch to OS X 10.7 and Qt 5.6 for Mac binary
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea8428a2f4a26848e2712c8b85f479e5a22c13dc
commit ea8428a2f4a26848e2712c8b85f479e5a22c13dc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 5 13:08:16 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 6 13:08:52 2016 -0400
Utilities/Release: Switch to OS X 10.7 and Qt 5.6 for Mac binary
Use a new build machine to produce the OS X binary targeting OS X 10.7
and using Qt 5.6.
diff --git a/Utilities/Release/osx_release.cmake b/Utilities/Release/osx_release.cmake
index 568a98c..17f7df6 100644
--- a/Utilities/Release/osx_release.cmake
+++ b/Utilities/Release/osx_release.cmake
@@ -1,7 +1,7 @@
set(PROCESSORS 4)
set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
-set(HOST bigmac)
+set(HOST dragnipur)
set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j5")
set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
@@ -26,7 +26,7 @@ CMake_NO_CXX_STANDARD:BOOL=TRUE
CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE
")
set(ENV [[
-export CMAKE_PREFIX_PATH='/Users/kitware/dashboards/support/Qt-5.5.1'
+export CMAKE_PREFIX_PATH='/Users/kitware/SDKs/qt-5.6.0-clang-x64'
]])
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake)
-----------------------------------------------------------------------
Summary of changes:
Utilities/Release/osx_release.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list