Browse Source

Utilities/Release: Build OS X and Win binaries without OpenSSL

This will tell our curl to use the OS-native TLS/SSL APIs.
Brad King 10 years ago
parent
commit
7e6608fe64

+ 1 - 6
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

+ 1 - 6
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