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.
This commit is contained in:
Brad King 2014-12-18 10:42:21 -05:00
parent d64caa5372
commit 202056cdb8
2 changed files with 12 additions and 2 deletions

View File

@ -7,8 +7,13 @@ set(CPACK_BINARY_GENERATORS "NSIS ZIP")
set(CPACK_SOURCE_GENERATORS "ZIP") set(CPACK_SOURCE_GENERATORS "ZIP")
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j8") 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 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_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CMAKE_Fortran_COMPILER:FILEPATH=FALSE CMAKE_Fortran_COMPILER:FILEPATH=FALSE
CMAKE_GENERATOR:INTERNAL=Unix Makefiles CMAKE_GENERATOR:INTERNAL=Unix Makefiles

View File

@ -8,8 +8,13 @@ set(MAKE "${MAKE_PROGRAM} -j5")
set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ")
set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size 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 " 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_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_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 OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a