[Cmake-commits] CMake branch, next, updated. v2.8.7-2285-g5bae348

Rolf Eike Beer eike at sf-mail.de
Thu Jan 26 12:36:47 EST 2012


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  5bae348c4b4e8df0ac39746e8559d4db6e2d8b18 (commit)
       via  0640ec9476c2c85e592293290d0d2dd8986af27a (commit)
      from  e8f216d2ead9cc3ce2deb198270e0207b3208d53 (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=5bae348c4b4e8df0ac39746e8559d4db6e2d8b18
commit 5bae348c4b4e8df0ac39746e8559d4db6e2d8b18
Merge: e8f216d 0640ec9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 12:36:39 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 12:36:39 2012 -0500

    Merge topic 'improve-findcurl' into next
    
    0640ec9 FindCURL: detect version number also for older versions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0640ec9476c2c85e592293290d0d2dd8986af27a
commit 0640ec9476c2c85e592293290d0d2dd8986af27a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 18:24:56 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 18:25:25 2012 +0100

    FindCURL: detect version number also for older versions
    
    Older versions of cURL do not have a curlver.h, but have the version define
    directly in curl.h.

diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake
index 517638a..cc00d53 100644
--- a/Modules/FindCURL.cmake
+++ b/Modules/FindCURL.cmake
@@ -34,11 +34,16 @@ FIND_LIBRARY(CURL_LIBRARY NAMES
 )
 MARK_AS_ADVANCED(CURL_LIBRARY)
 
-IF(CURL_INCLUDE_DIR AND EXISTS "${CURL_INCLUDE_DIR}/curl/curlver.h")
-  FILE(STRINGS "${CURL_INCLUDE_DIR}/curl/curlver.h" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"")
+IF(CURL_INCLUDE_DIR)
+  FOREACH(_curl_version_header curlver.h curl.h)
+    IF(EXISTS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}")
+      FILE(STRINGS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"")
 
-  STRING(REGEX REPLACE "^#define[\t ]+LIBCURL_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CURL_VERSION_STRING "${curl_version_str}")
-  UNSET(curl_version_str)
+      STRING(REGEX REPLACE "^#define[\t ]+LIBCURL_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CURL_VERSION_STRING "${curl_version_str}")
+      UNSET(curl_version_str)
+      BREAK()
+    ENDIF()
+  ENDFOREACH(_curl_version_header)
 ENDIF()
 
 # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list