[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-409-gf6651af

[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  f6651af5d1ea6ba9699a66183285528be2723ac6 (commit)
       via  7e6608fe646729f7f14eedb55bd26d97a36223f7 (commit)
      from  a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db (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=f6651af5d1ea6ba9699a66183285528be2723ac6
commit f6651af5d1ea6ba9699a66183285528be2723ac6
Merge: a5ab0a6 7e6608f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:30:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 09:30:19 2015 -0500

    Merge topic 'binary-release-no-OpenSSL-on-Win-or-OSX' into next
    
    7e6608fe Utilities/Release: Build OS X and Win binaries without OpenSSL


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e6608fe646729f7f14eedb55bd26d97a36223f7
commit 7e6608fe646729f7f14eedb55bd26d97a36223f7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:29:03 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:29:50 2015 -0500

    Utilities/Release: Build OS X and Win binaries without OpenSSL
    
    This will tell our curl to use the OS-native TLS/SSL APIs.

diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index 345870b..2511db4 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -7,13 +7,8 @@ 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=${CMAKE_USE_OPENSSL}
+CMAKE_USE_OPENSSL:BOOL=OFF
 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 910fcbd..bc95982 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -8,13 +8,8 @@ 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=${CMAKE_USE_OPENSSL}
+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

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

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


hooks/post-receive
-- 
CMake