Mercurial > hg > orthanc

changeset 28:ef264c1e9ee5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix msvc build
author Administrator@jodogne-w01
date Wed, 29 Aug 2012 11:07:55 +0200
parents cfe212a513c5
children 042ac60f5bf9
files Resources/CMake/OpenSslConfiguration.cmake
diffstat 1 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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)