Zorba

Merge lp:~gabipetrovay/zorba/proxy_curl into lp:zorba

  1. proxy_curl
  2. Merge into trunk
Proposed by Gabriel Petrovay
Status: Merged
Merged at revision: 10499
Proposed branch: lp:~gabipetrovay/zorba/proxy_curl
Merge into: lp:zorba
Diff against target: 61 lines (+25/-10)
2 files modified
cmake_modules/Windows/FindCURL.cmake (+23/-8)
cmake_modules/Windows/ProxyFindModule.cmake (+2/-2)
To merge this branch: bzr merge lp:~gabipetrovay/zorba/proxy_curl
Reviewer Review Type Date Requested Status
David Graf Pending
Review via email: mp+78720@code.launchpad.net

Commit message

Zorba build can now find CURL both in a binary distribution and a source build directory.

Description of the change

Enhanced CURL search on windows.

Both a CURL binary distribution and a source build should be found on Windows.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake_modules/Windows/FindCURL.cmake'
2--- cmake_modules/Windows/FindCURL.cmake 2011-09-26 12:50:56 +0000
3+++ cmake_modules/Windows/FindCURL.cmake 2011-10-08 16:44:21 +0000
4@@ -31,13 +31,28 @@
5
6 IF (CURL_FOUND)
7
8- # find the needed DLL's
9- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
10- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libeay32")
11- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "openldap")
12- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "ssleay32")
13-
14- # find additional DLL's
15- FIND_DLL_WIN32 (libsasl.dll)
16+ IF (EXISTS "${FOUND_LOCATION}/curl.exe")
17+
18+ MESSAGE (STATUS "Found CURL binary distribution")
19+
20+ # find the needed DLL's
21+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
22+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libeay32")
23+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "openldap")
24+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "ssleay32")
25+
26+ ELSE (EXISTS "${FOUND_LOCATION}/curl.exe")
27+
28+ MESSAGE (STATUS "Found CURL source build")
29+
30+ # find the needed DLL's
31+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
32+
33+ # find additional DLL's
34+ FIND_DLL_WIN32 ("libeay32.dll")
35+ FIND_DLL_WIN32 ("ssleay32.dll")
36+ #FIND_DLL_WIN32 (libsasl.dll)
37+
38+ ENDIF (EXISTS "${FOUND_LOCATION}/curl.exe")
39
40 ENDIF (CURL_FOUND)
41
42=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
43--- cmake_modules/Windows/ProxyFindModule.cmake 2011-10-05 20:22:04 +0000
44+++ cmake_modules/Windows/ProxyFindModule.cmake 2011-10-08 16:44:21 +0000
45@@ -243,7 +243,7 @@
46 TMP_DLL_VAR
47 "${NAME}.dll"
48 PATHS "${LIBRARY_LOCATION}"
49- PATH_SUFFIXES "bin" "bin/Release"
50+ PATH_SUFFIXES "bin" "bin/Release" "lib"
51 NO_DEFAULT_PATH
52 )
53
54@@ -308,7 +308,7 @@
55 TMP_DLL_VAR
56 "${NAME}"
57 PATHS "${LIBRARY_LOCATION}"
58- PATH_SUFFIXES "bin" "bin/Release"
59+ PATH_SUFFIXES "bin" "bin/Release" "lib"
60 NO_DEFAULT_PATH
61 )
62

Subscribers

People subscribed via source and target branches