[Cmake-commits] CMake branch, next, updated. v3.3.2-1437-gbf024a7

[Brad King]

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  bf024a798e96a2cf2dcae8b704258b162588e243 (commit)
       via  a5041efeed15f3c389909d4fa748b8f1bcaf24d7 (commit)
       via  4f2ccc7ce37df18d0ac15cfec8030df6ade95b04 (commit)
       via  abb935f986e1de5f836f2220572d47cddb54ce6d (commit)
      from  8a2fb65090dd95053d3d5e24e645868530355636 (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=bf024a798e96a2cf2dcae8b704258b162588e243
commit bf024a798e96a2cf2dcae8b704258b162588e243
Merge: 8a2fb65 a5041ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:08:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 13:08:54 2015 -0400

    Merge topic 'release-no-old-osx' into next
    
    a5041efe Tests: Rename OS X nightly release binary test
    4f2ccc7c Utilities/Release: Drop unused OS X ppc/i386 release script
    abb935f9 Tests: Drop nightly OS X ppc/i386 binary


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5041efeed15f3c389909d4fa748b8f1bcaf24d7
commit a5041efeed15f3c389909d4fa748b8f1bcaf24d7
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:07:55 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=4f2ccc7ce37df18d0ac15cfec8030df6ade95b04
commit 4f2ccc7ce37df18d0ac15cfec8030df6ade95b04
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:07:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:07:32 2015 -0400

    Utilities/Release: Drop unused OS X ppc/i386 release script

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=abb935f986e1de5f836f2220572d47cddb54ce6d
commit abb935f986e1de5f836f2220572d47cddb54ce6d
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:06:38 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:
 Tests/CMakeLists.txt                         |    4 +---
 Utilities/Release/dashmacmini2_release.cmake |   25 -------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 Utilities/Release/dashmacmini2_release.cmake


hooks/post-receive
-- 
CMake