comparison Resources/Orthanc/CMake/LibCurlConfiguration.cmake @ 49:c71a008fc1e3

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 22 Nov 2023 07:59:30 +0100
parents 21499c134785
children 509334672b6b
comparison
equal deleted inserted replaced
48:2e6c0fe4bdee 49:c71a008fc1e3
1 # Orthanc - A Lightweight, RESTful DICOM Store 1 # Orthanc - A Lightweight, RESTful DICOM Store
2 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics 2 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
3 # Department, University Hospital of Liege, Belgium 3 # Department, University Hospital of Liege, Belgium
4 # Copyright (C) 2017-2021 Osimis S.A., Belgium 4 # Copyright (C) 2017-2023 Osimis S.A., Belgium
5 # Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
5 # 6 #
6 # This program is free software: you can redistribute it and/or 7 # This program is free software: you can redistribute it and/or
7 # modify it under the terms of the GNU Lesser General Public License 8 # modify it under the terms of the GNU Lesser General Public License
8 # as published by the Free Software Foundation, either version 3 of 9 # as published by the Free Software Foundation, either version 3 of
9 # the License, or (at your option) any later version. 10 # the License, or (at your option) any later version.
17 # License along with this program. If not, see 18 # License along with this program. If not, see
18 # <http://www.gnu.org/licenses/>. 19 # <http://www.gnu.org/licenses/>.
19 20
20 21
21 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL) 22 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
22 SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.64.0) 23 SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.77.0)
23 SET(CURL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/curl-7.64.0.tar.gz") 24 SET(CURL_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/curl-7.77.0.tar.gz")
24 SET(CURL_MD5 "a026740d599a32bcbbe6e70679397899") 25 SET(CURL_MD5 "478e8b06801d9d030609c9e6cf859229")
25 26
26 if (IS_DIRECTORY "${CURL_SOURCES_DIR}") 27 if (IS_DIRECTORY "${CURL_SOURCES_DIR}")
27 set(FirstRun OFF) 28 set(FirstRun OFF)
28 else() 29 else()
29 set(FirstRun ON) 30 set(FirstRun ON)
32 DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}") 33 DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}")
33 34
34 if (FirstRun) 35 if (FirstRun)
35 execute_process( 36 execute_process(
36 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 37 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
37 ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-7.64.0-cmake.patch 38 ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-7.77.0.patch
38 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 39 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
39 RESULT_VARIABLE Failure 40 RESULT_VARIABLE Failure
40 ) 41 )
41 42
42 if (Failure) 43 if (Failure)
106 else() 107 else()
107 SET(TMP_OS "x86") 108 SET(TMP_OS "x86")
108 endif() 109 endif()
109 110
110 set_property( 111 set_property(
111 SOURCE ${CURL_SOURCES} 112 SOURCE ${CURL_SOURCES} APPEND
112 PROPERTY COMPILE_DEFINITIONS "HAVE_CONFIG_H=1;OS=\"${TMP_OS}\"" 113 PROPERTY COMPILE_DEFINITIONS "HAVE_CONFIG_H=1;OS=\"${TMP_OS}\""
113 ) 114 )
114 115
115 include(${CURL_SOURCES_DIR}/CMake/Macros.cmake) 116 include(${CURL_SOURCES_DIR}/CMake/Macros.cmake)
116 117