[Cmake-commits] CMake branch, next, updated. v3.3.2-1441-ga6f88ed
Brad King
brad.king at kitware.com
Mon Oct 5 13:09:50 EDT 2015
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 a6f88ed63fd27070a98b52582ab582374824bf30 (commit)
via 992c43d2ed0bdede5d9d0389c51b8e28bb22cd96 (commit)
via 45fa326b6ccceae1858ef3f30c11341c8b397d73 (commit)
via 9cbab63ee143662a94fa050b95d02e9f14342907 (commit)
from bf024a798e96a2cf2dcae8b704258b162588e243 (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=a6f88ed63fd27070a98b52582ab582374824bf30
commit a6f88ed63fd27070a98b52582ab582374824bf30
Merge: bf024a7 992c43d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:09:50 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 13:09:50 2015 -0400
Merge topic 'release-no-old-osx' into next
992c43d2 Tests: Rename OS X nightly release binary test
45fa326b Utilities/Release: Drop OS X ppc/i386 binary
9cbab63e Tests: Drop nightly OS X ppc/i386 binary
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=992c43d2ed0bdede5d9d0389c51b8e28bb22cd96
commit 992c43d2ed0bdede5d9d0389c51b8e28bb22cd96
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:07:55 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:09:36 2015 -0400
Tests: Rename OS X nightly release binary test
The "Mac64" build is now the primary and only OS X build, so just name
it "OSX".
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 46a1243..1861d82 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
if(CMAKE_BUILD_NIGHTLY_RELEASES)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
dash2win64_release.cmake)
- ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac64
+ ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
dashmacmini5_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
magrathea_release.cmake)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45fa326b6ccceae1858ef3f30c11341c8b397d73
commit 45fa326b6ccceae1858ef3f30c11341c8b397d73
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 11:53:14 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:09:04 2015 -0400
Utilities/Release: Drop OS X ppc/i386 binary
Users with OS X 10.5 or below can build from source or use an older
CMake version.
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 4cfa2ed..76057d1 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -7,8 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
set(RELEASE_SCRIPTS_BATCH_1
dash2win64_release.cmake # Windows
- dashmacmini2_release.cmake # Mac Darwin universal ppc;i386
- dashmacmini5_release.cmake # Mac Darwin64 universal x86_64;i386
+ dashmacmini5_release.cmake # OS X x86_64
magrathea_release.cmake # Linux
linux64_release.cmake # Linux x86_64
)
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
deleted file mode 100644
index cd4c5a1..0000000
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(PROCESSORS 2)
-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 dashmacmini2)
-set(MAKE_PROGRAM "make")
-set(MAKE "${MAKE_PROGRAM} -j2")
-set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
-set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
-set(INITIAL_CACHE "
-CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
-CMAKE_USE_OPENSSL:BOOL=ON
-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_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-CPACK_SYSTEM_NAME:STRING=Darwin-universal
-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.0/install/bin/qmake
-")
-get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
-include(${path}/release_cmake.cmake)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cbab63ee143662a94fa050b95d02e9f14342907
commit 9cbab63ee143662a94fa050b95d02e9f14342907
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:06:15 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:09:04 2015 -0400
Tests: Drop nightly OS X ppc/i386 binary
Users with OS X 10.5 or below can build from source or use an older
CMake version.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c82cb68..46a1243 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -687,8 +687,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
if(CMAKE_BUILD_NIGHTLY_RELEASES)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
dash2win64_release.cmake)
- ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac
- dashmacmini2_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac64
dashmacmini5_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list