[Cmake-commits] CMake branch, next, updated. v2.8.9-939-g9657a09

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9657a0985a40c7f8649cf50ac8706e03c5580ea4 (commit)
       via  708b53e709712e8c90bcc411145f7a92661e96fa (commit)
      from  6f372f4649a90fd41a4fc50552151e899a9ff278 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9657a0985a40c7f8649cf50ac8706e03c5580ea4
commit 9657a0985a40c7f8649cf50ac8706e03c5580ea4
Merge: 6f372f4 708b53e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 1 13:26:31 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 1 13:26:31 2012 -0400

    Merge topic 'FindCURL-libcurl' into next
    
    708b53e FindCURL: Find older MSVC prebuilts


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=708b53e709712e8c90bcc411145f7a92661e96fa
commit 708b53e709712e8c90bcc411145f7a92661e96fa
Author:     Andreas Mohr <andi at lisas.de>
AuthorDate: Sun Sep 30 04:19:00 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 1 13:21:46 2012 -0400

    FindCURL: Find older MSVC prebuilts
    
    Older Windows MSVC CURL prebuilts have the .lib named as "libcurl.lib".

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)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCURL.cmake |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake