summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-10-02 14:06:37 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-10-02 14:06:37 (GMT)
commit3aa15d62f873161e8cbce5d4855101daefd971ab (patch)
tree5032fa468af8923fa92a853c45902d9c63831593
parentd7bc22553064b2c39e6f73682ad0c06e452c6fdd (diff)
parent708b53e709712e8c90bcc411145f7a92661e96fa (diff)
downloadCMake-3aa15d62f873161e8cbce5d4855101daefd971ab.zip
CMake-3aa15d62f873161e8cbce5d4855101daefd971ab.tar.gz
CMake-3aa15d62f873161e8cbce5d4855101daefd971ab.tar.bz2
Merge topic 'FindCURL-libcurl'
708b53e FindCURL: Find older MSVC prebuilts
-rw-r--r--Modules/FindCURL.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake
index e080f1a..0fb8f45 100644
--- a/Modules/FindCURL.cmake
+++ b/Modules/FindCURL.cmake
@@ -24,13 +24,15 @@
find_path(CURL_INCLUDE_DIR NAMES curl/curl.h)
mark_as_advanced(CURL_INCLUDE_DIR)
-# Look for the library.
+# Look for the library (sorted from most current/relevant entry to least).
find_library(CURL_LIBRARY NAMES
curl
# Windows MSVC prebuilts:
curllib
libcurl_imp
curllib_static
+ # Windows older "Win32 - MSVC" prebuilts (libcurl.lib, e.g. libcurl-7.15.5-win32-msvc.zip):
+ libcurl
)
mark_as_advanced(CURL_LIBRARY)