Commit 8478b403 authored by Peter Wu's avatar Peter Wu Committed by Daniel Stenberg
Browse files

cmake: use LIBCURL_VERSION from curlver.h 



This matches the behavior from autotools. The auxiliary major, minor
and patch components are not needed anymore and therefore removed.

Signed-off-by: default avatarPeter Wu <peter@lekensteyn.nl>
parent 2a2bb78c

CMakeLists.txt

+6 −16
Original line number Diff line number Diff line
@@ -48,27 +48,17 @@ project( CURL C ) 
message(WARNING "the curl cmake build system is poorly maintained. Be aware")



file (READ ${CURL_SOURCE_DIR}/include/curl/curlver.h CURL_VERSION_H_CONTENTS)

string (REGEX MATCH "LIBCURL_VERSION_MAJOR[ \t]+([0-9]+)"

  LIBCURL_VERSION_MJ ${CURL_VERSION_H_CONTENTS})

string (REGEX MATCH "([0-9]+)"

  LIBCURL_VERSION_MJ ${LIBCURL_VERSION_MJ})

string (REGEX MATCH

  "LIBCURL_VERSION_MINOR[ \t]+([0-9]+)"

  LIBCURL_VERSION_MI ${CURL_VERSION_H_CONTENTS})

string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_MI ${LIBCURL_VERSION_MI})

string (REGEX MATCH

  "LIBCURL_VERSION_PATCH[ \t]+([0-9]+)"

  LIBCURL_VERSION_PT ${CURL_VERSION_H_CONTENTS})

string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_PT ${LIBCURL_VERSION_PT})

set (CURL_MAJOR_VERSION ${LIBCURL_VERSION_MJ})

set (CURL_MINOR_VERSION ${LIBCURL_VERSION_MI})

set (CURL_PATCH_VERSION ${LIBCURL_VERSION_PT})

string (REGEX MATCH "#define LIBCURL_VERSION \"[^\"]*"

  CURL_VERSION ${CURL_VERSION_H_CONTENTS})

string (REGEX REPLACE "[^\"]+\"" "" CURL_VERSION ${CURL_VERSION})

string (REGEX MATCH "#define LIBCURL_VERSION_NUM 0x[0-9a-fA-F]+"

  CURL_VERSION_NUM ${CURL_VERSION_H_CONTENTS})

string (REGEX REPLACE "[^0]+0x" "" CURL_VERSION_NUM ${CURL_VERSION_NUM})



include_regular_expression("^.*$")    # Sukender: Is it necessary?



# Setup package meta-data

# SET(PACKAGE "curl")

set(CURL_VERSION ${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION})

message(STATUS "curl version=[${CURL_VERSION}]")

# SET(PACKAGE_TARNAME "curl")

# SET(PACKAGE_NAME "curl")