[Cmake-commits] [cmake-commits] lowman committed FindCURL.cmake 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv22276

Modified Files:
	FindCURL.cmake 
Log Message:
Fixes issue #9862 by adding official msvc import library names to FindCURL


Index: FindCURL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCURL.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** FindCURL.cmake	28 Sep 2009 15:45:33 -0000	1.5
--- FindCURL.cmake	5 Jan 2010 04:25:57 -0000	1.6
***************
*** 24,28 ****
  
  # Look for the library.
! FIND_LIBRARY(CURL_LIBRARY NAMES curl)
  MARK_AS_ADVANCED(CURL_LIBRARY)
  
--- 24,34 ----
  
  # Look for the library.
! FIND_LIBRARY(CURL_LIBRARY NAMES 
!     curl
!   # Windows MSVC prebuilts:
!     curllib
!     libcurl_imp
!     curllib_static
! )
  MARK_AS_ADVANCED(CURL_LIBRARY)
  
***************
*** 35,40 ****
    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)
--- 41,43 ----