From aefd10ad7068136af92bd4cf9950c4385dd90271 Mon Sep 17 00:00:00 2001 From: Philip Lowman Date: Mon, 4 Jan 2010 23:25:57 -0500 Subject: Fixes issue #9862 by adding official msvc import library names to FindCURL --- Modules/FindCURL.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index 3d8ae3a..f301b24 100644 --- a/Modules/FindCURL.cmake +++ b/Modules/FindCURL.cmake @@ -23,7 +23,13 @@ FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h) MARK_AS_ADVANCED(CURL_INCLUDE_DIR) # Look for the library. -FIND_LIBRARY(CURL_LIBRARY NAMES curl) +FIND_LIBRARY(CURL_LIBRARY NAMES + curl + # Windows MSVC prebuilts: + curllib + libcurl_imp + curllib_static +) MARK_AS_ADVANCED(CURL_LIBRARY) # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if @@ -34,7 +40,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR IF(CURL_FOUND) SET(CURL_LIBRARIES ${CURL_LIBRARY}) SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR}) -ELSE(CURL_FOUND) - SET(CURL_LIBRARIES) - SET(CURL_INCLUDE_DIRS) ENDIF(CURL_FOUND) -- cgit v0.12