[Cmake-commits] CMake branch, next, updated. v3.1.0-1250-g6efd16b

[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  6efd16b3cc70483824229c365f9a966e1e6ee12e (commit)
       via  86d0e016881d059056724d21a474bd90a92f1b4d (commit)
      from  ff6f0a122150fa577a2f37c14ddd06c1b8c387b7 (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=6efd16b3cc70483824229c365f9a966e1e6ee12e
commit 6efd16b3cc70483824229c365f9a966e1e6ee12e
Merge: ff6f0a1 86d0e01
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 10:44:32 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 10:44:32 2014 -0500

    Merge topic 'nightly-binary-updates' into next
    
    86d0e016 Utilities/Release: Build Windows and OS X binaries with native SSL


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86d0e016881d059056724d21a474bd90a92f1b4d
commit 86d0e016881d059056724d21a474bd90a92f1b4d
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: Thu Dec 18 10:42:21 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 0822a1c..b2f1ceb 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

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/dash2win64_release.cmake   |    7 ++++++-
 Utilities/Release/dashmacmini5_release.cmake |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake