Mercurial > hg > orthanc
comparison Resources/CMake/LibCurlConfiguration.cmake @ 1527:7b58e0048874
Upgrade to curl 7.44.0 for static and Windows builds
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 12 Aug 2015 11:17:43 +0200 |
parents | 728c22ade2e2 |
children | 4c1dbfddabd4 |
comparison
equal
deleted
inserted
replaced
1526:096a8af528c9 | 1527:7b58e0048874 |
---|---|
1 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL) | 1 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL) |
2 SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.26.0) | 2 SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.44.0) |
3 DownloadPackage( | 3 DownloadPackage( |
4 "3fa4d5236f2a36ca5c3af6715e837691" | 4 "cf46112b5151e2f1a3fd38439bdade23" |
5 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.26.0.tar.gz" | 5 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.44.0.tar.gz" |
6 "${CURL_SOURCES_DIR}") | 6 "${CURL_SOURCES_DIR}") |
7 | 7 |
8 include_directories(${CURL_SOURCES_DIR}/include) | 8 include_directories( |
9 ${CURL_SOURCES_DIR}/include | |
10 ) | |
11 | |
9 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES) | 12 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES) |
13 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES) | |
10 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*) | 14 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*) |
11 | |
12 #add_library(Curl STATIC ${CURL_SOURCES}) | |
13 #link_libraries(Curl) | |
14 | 15 |
15 add_definitions( | 16 add_definitions( |
16 -DCURL_STATICLIB=1 | 17 -DCURL_STATICLIB=1 |
17 -DBUILDING_LIBCURL=1 | 18 -DBUILDING_LIBCURL=1 |
18 -DCURL_DISABLE_LDAPS=1 | 19 -DCURL_DISABLE_LDAPS=1 |
50 SET(TMP_OS "x86") | 51 SET(TMP_OS "x86") |
51 endif() | 52 endif() |
52 | 53 |
53 set_property( | 54 set_property( |
54 SOURCE ${CURL_SOURCES} | 55 SOURCE ${CURL_SOURCES} |
55 PROPERTY COMPILE_DEFINITIONS "HAVE_TIME_H;HAVE_STRUCT_TIMEVAL;HAVE_SYS_STAT_H;HAVE_SOCKET;HAVE_STRUCT_SOCKADDR_STORAGE;HAVE_SYS_SOCKET_H;HAVE_SOCKET;HAVE_SYS_SOCKET_H;HAVE_NETINET_IN_H;HAVE_NETDB_H;HAVE_FCNTL_O_NONBLOCK;HAVE_FCNTL_H;HAVE_SELECT;HAVE_ERRNO_H;HAVE_SEND;HAVE_RECV;OS=\"${TMP_OS}\"") | 56 PROPERTY COMPILE_DEFINITIONS "HAVE_TIME_H;HAVE_STRUCT_TIMEVAL;HAVE_SYS_STAT_H;HAVE_SOCKET;HAVE_STRUCT_SOCKADDR_STORAGE;HAVE_SYS_SOCKET_H;HAVE_SOCKET;HAVE_SYS_SOCKET_H;HAVE_NETINET_IN_H;HAVE_NETDB_H;HAVE_FCNTL_O_NONBLOCK;HAVE_FCNTL_H;HAVE_SELECT;HAVE_ERRNO_H;HAVE_SEND;HAVE_RECV;HAVE_LONGLONG;OS=\"${TMP_OS}\"" |
57 ) | |
58 | |
59 if (MSVC) | |
60 set_property(SOURCE ${CURL_SOURCES} PROPERTY COMPILE_FLAGS "/I${CURL_SOURCES_DIR}/lib") | |
61 else() | |
62 set_property(SOURCE ${CURL_SOURCES} PROPERTY COMPILE_FLAGS "-I${CURL_SOURCES_DIR}/lib") | |
63 endif() | |
56 | 64 |
57 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") | 65 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") |
58 add_definitions( | 66 add_definitions( |
59 -DRECV_TYPE_ARG1=int | 67 -DRECV_TYPE_ARG1=int |
60 -DRECV_TYPE_ARG2=void* | 68 -DRECV_TYPE_ARG2=void* |