Mercurial > hg > orthanc

comparison Resources/CMake/LibCurlConfiguration.cmake @ 2095:9e8b315625c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to curl 7.50.3 for static and Windows builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 06 Oct 2016 15:17:02 +0200
parents 50dd3249732e
children 8b51b133bb8b
comparison
equal deleted inserted replaced
2094:72a7624215ae 2095:9e8b315625c1
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.44.0) 2 SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.50.3)
3 SET(CURL_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.44.0.tar.gz") 3 SET(CURL_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.50.3.tar.gz")
4 SET(CURL_MD5 "cf46112b5151e2f1a3fd38439bdade23") 4 SET(CURL_MD5 "870e16fd88a88b52e26a4f04dfc161db")
5 5
6 DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}") 6 DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}")
7 7
8 include_directories( 8 include_directories(
9 ${CURL_SOURCES_DIR}/include 9 ${CURL_SOURCES_DIR}/include
10 ) 10 )
11 11
12 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/vauth CURL_SOURCES)
13 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES) 14 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
14 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*) 15 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*)
15 16
16 add_definitions( 17 add_definitions(
17 -DBUILDING_LIBCURL=1 18 -DBUILDING_LIBCURL=1
41 endif() 42 endif()
42 43
43 if (NOT EXISTS "${CURL_SOURCES_DIR}/lib/curl_config.h") 44 if (NOT EXISTS "${CURL_SOURCES_DIR}/lib/curl_config.h")
44 file(WRITE ${CURL_SOURCES_DIR}/lib/curl_config.h "") 45 file(WRITE ${CURL_SOURCES_DIR}/lib/curl_config.h "")
45 46
47 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h "#include \"../vauth.h\"\n")
48 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/digest.h "#include \"../digest.h\"\n")
49 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/ntlm.h "#include \"../ntlm.h\"\n")
50 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vtls/vtls.h "#include \"../../vtls/vtls.h\"\n")
51
46 file(GLOB CURL_LIBS_HEADERS ${CURL_SOURCES_DIR}/lib/*.h) 52 file(GLOB CURL_LIBS_HEADERS ${CURL_SOURCES_DIR}/lib/*.h)
47 foreach (header IN LISTS CURL_LIBS_HEADERS) 53 foreach (header IN LISTS CURL_LIBS_HEADERS)
48 get_filename_component(filename ${header} NAME) 54 get_filename_component(filename ${header} NAME)
55 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/${filename} "#include \"../${filename}\"\n")
49 file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/${filename} "#include \"../${filename}\"\n") 56 file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/${filename} "#include \"../${filename}\"\n")
50 endforeach() 57 endforeach()
51 endif() 58 endif()
52 59
53 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR 60 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR