diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-18 09:30:29 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-18 09:30:29 -0500 |
| commit | 05e4fc6b2a664dee4229742577cf4d065ecec713 (patch) | |
| tree | 248351ece6c621e563fbb07f37d6481f0af43048 | |
| parent | 8371cd7893f4a10eefe9f806ce5ac0cdff152b08 (diff) | |
| parent | 7e6608fe646729f7f14eedb55bd26d97a36223f7 (diff) | |
| download | cmake-05e4fc6b2a664dee4229742577cf4d065ecec713.tar.gz | |
Merge branch 'binary-release-no-OpenSSL-on-Win-or-OSX' into release
| -rw-r--r-- | Utilities/Release/dash2win64_release.cmake | 7 | ||||
| -rw-r--r-- | Utilities/Release/dashmacmini5_release.cmake | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake index 345870bc7b..2511db4f78 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 910fcbd157..bc95982df8 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 |