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 9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc (commit)
via b682debd65f07fb219a6a9c6b5fa5f42b468a845 (commit)
from 3ac6a120f45ebe47cdc9388ffe9b19f4ac341e7b (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=9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc
commit 9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc
Merge: 3ac6a12 b682deb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 19 15:47:41 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 19 15:47:41 2016 -0500
Merge topic 'update-osx-release' into next
b682debd Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b682debd65f07fb219a6a9c6b5fa5f42b468a845
commit b682debd65f07fb219a6a9c6b5fa5f42b468a845
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 18 15:32:38 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 19 15:47:18 2016 -0500
Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary
Use a new build machine to produce the OS X binary targeting OS X 10.7
and using Qt 5.5.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7bb0721..0639804 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -687,7 +687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
dash3win7_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
- dashmacmini5_release.cmake)
+ bigmac_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
magrathea_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/bigmac_release.cmake
similarity index 55%
rename from Utilities/Release/dashmacmini5_release.cmake
rename to Utilities/Release/bigmac_release.cmake
index b147013..568a98c 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/bigmac_release.cmake
@@ -1,27 +1,32 @@
set(PROCESSORS 4)
set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
-# set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -shared-libgcc -lstdc++-static\\\")")
set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
-set(HOST dashmacmini5)
+set(HOST bigmac)
set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j5")
set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
set(CPACK_SOURCE_GENERATORS "TGZ TZ")
set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
+set(CC clang)
+set(CXX clang++)
+set(CFLAGS "")
+set(CXXFLAGS "-stdlib=libc++")
set(INITIAL_CACHE "
-CMAKE_USE_OPENSSL:BOOL=OFF
-OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
-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.6
+CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CPACK_SYSTEM_NAME:STRING=Darwin-x86_64
BUILD_QtDialog:BOOL=TRUE
CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
CMake_INSTALL_DEPENDENCIES:BOOL=ON
-QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.6/install/bin/qmake
+CMAKE_SKIP_RPATH:BOOL=TRUE
+CMake_NO_C_STANDARD:BOOL=TRUE
+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'
+]])
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index d41c4ec..403367b 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -7,7 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
set(RELEASE_SCRIPTS_BATCH_1
dash3win7_release.cmake # Windows
- dashmacmini5_release.cmake # OS X x86_64
+ bigmac_release.cmake # OS X x86_64
magrathea_release.cmake # Linux
linux64_release.cmake # Linux x86_64
)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake