# HG changeset patch # User Administrator@jodogne-w01 # Date 1346231275 -7200 # Node ID ef264c1e9ee5a105d44073581ed43c4c369376fa # Parent cfe212a513c5a356d790fe323abe3aef7fecc2e3 fix msvc build diff -r cfe212a513c5 -r ef264c1e9ee5 Resources/CMake/OpenSslConfiguration.cmake --- a/Resources/CMake/OpenSslConfiguration.cmake Tue Aug 28 17:40:01 2012 +0200 +++ b/Resources/CMake/OpenSslConfiguration.cmake Wed Aug 29 11:07:55 2012 +0200 @@ -51,19 +51,6 @@ -DOPENSSL_NO_RIPEMD ) - if (${MSVC}) - # http://stackoverflow.com/a/1372836/881731 -# add_definitions(-D_WINSOCKAPI_) - add_definitions( - -DOPENSSL_SYSNAME_WIN32 - -DOPENSSL_SYS_MSDOS - -DSO_WIN32 -# -DWIN32_LEAN_AND_MEAN - -DOPENSSL_NO_SOCK - -DL_ENDIAN - ) - endif() - include_directories( ${OPENSSL_SOURCES_DIR} ${OPENSSL_SOURCES_DIR}/crypto @@ -148,9 +135,17 @@ ${OPENSSL_SOURCES_DIR}/crypto/sparcv9cap.c ${OPENSSL_SOURCES_DIR}/crypto/x509v3/tabtest.c ${OPENSSL_SOURCES_DIR}/crypto/x509v3/v3conf.c + ${OPENSSL_SOURCES_DIR}/crypto/des/des.c ${OPENSSL_SOURCES_DIR}/ssl/ssl_task.c ) + if (${MSVC}) + set_source_files_properties( + ${OPENSSL_SOURCES} + PROPERTIES COMPILE_DEFINITIONS + "OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN") + endif() + add_library(OpenSSL STATIC ${OPENSSL_SOURCES}) link_libraries(OpenSSL)