← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/bug1003635 into lp:zorba

 

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1003635 into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)
  Juan Zacarias (juan457)
Related bugs:
  Bug #1003635 in Zorba: "CURL libraries for windows don't have SSL support"
  https://bugs.launchpad.net/zorba/+bug/1003635

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1003635/+merge/107117

This is a very small change, but we need to include libcurl with SSL Support and all related files...
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1003635/+merge/107117
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/Windows/FindCURL.cmake'
--- cmake_modules/Windows/FindCURL.cmake	2012-05-03 12:31:51 +0000
+++ cmake_modules/Windows/FindCURL.cmake	2012-05-23 20:55:24 +0000
@@ -40,6 +40,7 @@
     FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libeay32")
     FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "openldap")
     FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "ssleay32")
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libsasl")
 
   ELSE (EXISTS "${FOUND_LOCATION}/curl.exe")
 
@@ -51,7 +52,7 @@
     # find additional DLL's
     FIND_DLL_WIN32 ("libeay32.dll")
     FIND_DLL_WIN32 ("ssleay32.dll")
-    #FIND_DLL_WIN32 (libsasl.dll)
+    FIND_DLL_WIN32 ("libsasl.dll")
 
   ENDIF (EXISTS "${FOUND_LOCATION}/curl.exe")
 


Follow ups