[Cmake-commits] CMake branch, next, updated. v3.1.0-1305-g29b9c99

[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  29b9c996900a876060ca9324a2b4d9454005ea1b (commit)
       via  202056cdb89da39e35d8af745c1ff0852a9be75d (commit)
       via  d64caa5372b182ce48f752c9afb9141d56055bd2 (commit)
      from  64972eddc8caf4663356ae20ad25bb8cc9987147 (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=29b9c996900a876060ca9324a2b4d9454005ea1b
commit 29b9c996900a876060ca9324a2b4d9454005ea1b
Merge: 64972ed 202056c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 22 08:48:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 22 08:48:16 2014 -0500

    Merge topic 'nightly-binary-updates' into next
    
    202056cd Utilities/Release: Build Windows and OS X binaries with native SSL
    d64caa53 Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=202056cdb89da39e35d8af745c1ff0852a9be75d
commit 202056cdb89da39e35d8af745c1ff0852a9be75d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 10:42:21 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 22 08:47:46 2014 -0500

    Utilities/Release: Build Windows and OS X binaries with native SSL
    
    For the nightly binaries, turn of CMAKE_USE_OPENSSL on Windows and OS X
    10.6+ platforms.  This will activate the new curl behavior to use the
    OS-native SSL/TLS implementation.

diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index 848e2f4..345870b 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -7,8 +7,13 @@ set(CPACK_BINARY_GENERATORS "NSIS ZIP")
 set(CPACK_SOURCE_GENERATORS "ZIP")
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j8")
+if(CMAKE_CREATE_VERSION STREQUAL "nightly")
+  set(CMAKE_USE_OPENSSL OFF)
+else()
+  set(CMAKE_USE_OPENSSL ON)
+endif()
 set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_USE_OPENSSL:BOOL=ON
+CMAKE_USE_OPENSSL:BOOL=${CMAKE_USE_OPENSSL}
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CMAKE_Fortran_COMPILER:FILEPATH=FALSE
 CMAKE_GENERATOR:INTERNAL=Unix Makefiles
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index a9c9cfb..910fcbd 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -8,8 +8,13 @@ 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
+if(CMAKE_CREATE_VERSION STREQUAL "nightly")
+  set(CMAKE_USE_OPENSSL OFF)
+else()
+  set(CMAKE_USE_OPENSSL ON)
+endif()
 set(INITIAL_CACHE "
-CMAKE_USE_OPENSSL:BOOL=ON
+CMAKE_USE_OPENSSL:BOOL=${CMAKE_USE_OPENSSL}
 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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d64caa5372b182ce48f752c9afb9141d56055bd2
commit d64caa5372b182ce48f752c9afb9141d56055bd2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 09:13:44 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 22 08:47:19 2014 -0500

    Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
    
    In commit v3.1.0-rc1~52^2 (Make the OSX 10.6+ release x86_64 only,
    2014-09-29) we forgot to remove the name "universal" from the binary
    name.  Since the binary is no longer universal, use "x86_64" instead.
    
    While at it, update the deployment target to actually be 10.6.

diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index 6c9b8f4..a9c9cfb 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -15,9 +15,9 @@ 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.5
+CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-CPACK_SYSTEM_NAME:STRING=Darwin64-universal
+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:


hooks/post-receive
-- 
CMake