From 277bd7df4751a0322198f94e79fbe6181dd4f649 Mon Sep 17 00:00:00 2001
From: Karol Herbst <git@karolherbst.de>
Date: Tue, 20 Aug 2013 00:43:02 +0200
Subject: [PATCH] cmake/curl: update to 7.32.0

also use native SSL Implementation of Windows instead of OpenSSL
---
 CMakeLists.txt                | 4 ++--
 cmake/modules/BuildCURL.cmake | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d00c79a..3dda828f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,11 +239,11 @@ else()
 endif()
 
 if(WIN32 OR NOT CURL_FOUND)
-  set(CURL_URL_DEFAULT http://curl.haxx.se/download/curl-7.26.0.tar.bz2)
+  set(CURL_URL_DEFAULT http://curl.haxx.se/download/curl-7.32.0.tar.bz2)
   set(CURL_URL ${CURL_URL_DEFAULT}
       CACHE STRING "URL to curl archive")
   if(CURL_URL STREQUAL CURL_URL_DEFAULT)
-    set(CURL_MD5 bfa80f01b3d300359cfb4d409b6136a3)
+    set(CURL_MD5 30d04b0a8c43c6770039d1bf033dfe79)
   else()
     unset(CURL_MD5)
   endif()
diff --git a/cmake/modules/BuildCURL.cmake b/cmake/modules/BuildCURL.cmake
index 0d4530d6..e570c0b6 100644
--- a/cmake/modules/BuildCURL.cmake
+++ b/cmake/modules/BuildCURL.cmake
@@ -14,8 +14,6 @@ else()
   set(CURL_DEBUG no)
 endif()
 
-# we need OpenSSL on all targets
-find_package(OpenSSL REQUIRED)
 if(WIN32 AND NOT MINGW)
   ExternalProject_Add(
     curl
@@ -32,7 +30,7 @@ if(WIN32 AND NOT MINGW)
     custom_build
     DEPENDEES configure
     DEPENDERS build
-    COMMAND nmake /f Makefile.vc MODE=dll WITH_SSL=static DEBUG=${CURL_DEBUG} GEN_PDB=no USE_SSPI=no USE_IPV6=no USE_IDN=no WITH_DEVEL=${OPENSSL_INCLUDE_DIR}/..
+    COMMAND nmake /f Makefile.vc MODE=dll DEBUG=${CURL_DEBUG} GEN_PDB=no USE_SSPI=yes USE_IPV6=no USE_IDN=no ENABLE_WINSSL=yes MACHINE=x86
     WORKING_DIRECTORY <SOURCE_DIR>/winbuild
   )
   
@@ -41,11 +39,12 @@ if(WIN32 AND NOT MINGW)
     source_dir
   )
   if(DEBUG)
-    set(CURL_INSTALL_DIR ${source_dir}/builds/libcurl-debug-dll-ssl-static/)
+    set(CURL_INSTALL_DIR ${source_dir}/builds/libcurl-vc-x86-debug-dll-spnego-winssl)
   else()
-    set(CURL_INSTALL_DIR ${source_dir}/builds/libcurl-release-dll-ssl-static/)
+    set(CURL_INSTALL_DIR ${source_dir}/builds/libcurl-vc-x86-release-dll-spnego-winssl)
   endif()
 else()
+  find_package(OpenSSL REQUIRED)
   set(CURL_INSTALL_DIR ${CMAKE_EXTERNAL_BINARY_DIR}/curl)
   ExternalProject_Add(
     curl