zorba-coders team mailing list archive

[Gabriel Petrovay <gabriel.petrovay@xxxxxxxxxx>]

Gabriel Petrovay has proposed merging lp:~gabipetrovay/zorba/proxy_curl into lp:zorba.

Requested reviews:
  David Graf (davidagraf)

For more details, see:
https://code.launchpad.net/~gabipetrovay/zorba/proxy_curl/+merge/78720

Enhanced CURL search on windows.

Both a CURL binary distribution and a source build should be found on Windows.
-- 
https://code.launchpad.net/~gabipetrovay/zorba/proxy_curl/+merge/78720
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'cmake_modules/Windows/FindCURL.cmake'
--- cmake_modules/Windows/FindCURL.cmake	2011-09-26 12:50:56 +0000
+++ cmake_modules/Windows/FindCURL.cmake	2011-10-08 16:44:21 +0000
@@ -31,13 +31,28 @@
 
 IF (CURL_FOUND)
 
-  # find the needed DLL's
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libeay32")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "openldap")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "ssleay32")
-
-  # find additional DLL's
-  FIND_DLL_WIN32 (libsasl.dll)
+  IF (EXISTS "${FOUND_LOCATION}/curl.exe")
+
+    MESSAGE (STATUS "Found CURL binary distribution")
+
+    # find the needed DLL's
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libeay32")
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "openldap")
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "ssleay32")
+
+  ELSE (EXISTS "${FOUND_LOCATION}/curl.exe")
+
+    MESSAGE (STATUS "Found CURL source build")
+
+    # find the needed DLL's
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
+
+    # find additional DLL's
+    FIND_DLL_WIN32 ("libeay32.dll")
+    FIND_DLL_WIN32 ("ssleay32.dll")
+    #FIND_DLL_WIN32 (libsasl.dll)
+
+  ENDIF (EXISTS "${FOUND_LOCATION}/curl.exe")
 
 ENDIF (CURL_FOUND)

=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
--- cmake_modules/Windows/ProxyFindModule.cmake	2011-10-05 20:22:04 +0000
+++ cmake_modules/Windows/ProxyFindModule.cmake	2011-10-08 16:44:21 +0000
@@ -243,7 +243,7 @@
       TMP_DLL_VAR
       "${NAME}.dll"
       PATHS "${LIBRARY_LOCATION}"
-      PATH_SUFFIXES "bin" "bin/Release" 
+      PATH_SUFFIXES "bin" "bin/Release" "lib"
       NO_DEFAULT_PATH
     )
 
@@ -308,7 +308,7 @@
       TMP_DLL_VAR
       "${NAME}"
       PATHS "${LIBRARY_LOCATION}"
-      PATH_SUFFIXES "bin" "bin/Release" 
+      PATH_SUFFIXES "bin" "bin/Release" "lib"
       NO_DEFAULT_PATH
     )