- updated cmake script to check for minimum libcurl version
This commit is contained in:
parent
48ab8b7b32
commit
539ab23e89
|
@ -95,6 +95,31 @@ IF(UNIX)
|
||||||
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES})
|
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
# check libcurl version #
|
||||||
|
IF(WIN32)
|
||||||
|
file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS)
|
||||||
|
ELSE()
|
||||||
|
file (READ ${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
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})
|
||||||
|
include_regular_expression("^.*$")
|
||||||
|
# Setup package meta-data
|
||||||
|
set(CURL_VERSION ${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION})
|
||||||
|
message(STATUS "curl version=[${CURL_VERSION}]")
|
||||||
|
IF( ${CURL_VERSION} VERSION_LESS 7.21.0)
|
||||||
|
message(STATUS "(please visit http://curl.haxx.se/libcurl/ to find a newer version)")
|
||||||
|
message(FATAL_ERROR " CURL version = [${CURL_VERSION}] we require AT LEAST [7.21.0]")
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
#########################################################################################
|
#########################################################################################
|
||||||
# glest lib
|
# glest lib
|
||||||
|
|
||||||
|
@ -203,17 +228,6 @@ SET_SOURCE_FILES_PROPERTIES(${MG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS
|
||||||
"${PLATFORM_SPECIFIC_DEFINES} ${STREFLOP_PROPERTIES} ${CXXFLAGS}")
|
"${PLATFORM_SPECIFIC_DEFINES} ${STREFLOP_PROPERTIES} ${CXXFLAGS}")
|
||||||
|
|
||||||
SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
||||||
|
|
||||||
|
|
||||||
# [RCL] FIXME: make it compiler-agnostic
|
|
||||||
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse")
|
|
||||||
|
|
||||||
#IF(WIN32)
|
|
||||||
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINDOWS -D_WIN32 -D_STDCALL_SUPPORTED -D_M_IX86 -DXML_LIBRARY -D_LIB -DUSE_STREFLOP -DSTREFLOP_SSE -DSTREFLOP_RANDOM_GEN_SIZE=32 -DLIBM_COMPILING_FLT32 -DCURL_STATICLIB")
|
|
||||||
#ENDIF()
|
|
||||||
|
|
||||||
#MESSAGE(STATUS "Source files: ${MG_SOURCE_FILES}")
|
|
||||||
#MESSAGE(STATUS "Include files: ${MG_INCLUDE_FILES}")
|
|
||||||
|
|
||||||
IF(NOT WIN32)
|
IF(NOT WIN32)
|
||||||
ADD_LIBRARY(libglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
ADD_LIBRARY(libglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||||
|
|
Loading…
Reference in New Issue