comparison OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake @ 5807:8279eaab0d1d attach-custom-data tip

merged default -> attach-custom-data
author Alain Mazy <am@orthanc.team>
date Tue, 24 Sep 2024 11:39:52 +0200
parents 49c29af02b13
children
comparison
equal deleted inserted replaced
5085:79f98ee4f04b 5807:8279eaab0d1d
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-2022 Osimis S.A., Belgium 4 # Copyright (C) 2017-2023 Osimis S.A., Belgium
5 # Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium 5 # Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
6 # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
6 # 7 #
7 # This program is free software: you can redistribute it and/or 8 # This program is free software: you can redistribute it and/or
8 # modify it under the terms of the GNU Lesser General Public License 9 # modify it under the terms of the GNU Lesser General Public License
9 # as published by the Free Software Foundation, either version 3 of 10 # as published by the Free Software Foundation, either version 3 of
10 # the License, or (at your option) any later version. 11 # the License, or (at your option) any later version.
18 # License along with this program. If not, see 19 # License along with this program. If not, see
19 # <http://www.gnu.org/licenses/>. 20 # <http://www.gnu.org/licenses/>.
20 21
21 22
22 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL) 23 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
23 SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.77.0) 24 SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-8.9.0)
24 SET(CURL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/curl-7.77.0.tar.gz") 25 SET(CURL_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/curl-8.9.0.tar.gz")
25 SET(CURL_MD5 "478e8b06801d9d030609c9e6cf859229") 26 SET(CURL_MD5 "f9bca5d4d5bac1f04e6c5eb4d0418618")
26 27
27 if (IS_DIRECTORY "${CURL_SOURCES_DIR}") 28 if (IS_DIRECTORY "${CURL_SOURCES_DIR}")
28 set(FirstRun OFF) 29 set(FirstRun OFF)
29 else() 30 else()
30 set(FirstRun ON) 31 set(FirstRun ON)
33 DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}") 34 DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}")
34 35
35 if (FirstRun) 36 if (FirstRun)
36 execute_process( 37 execute_process(
37 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 38 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
38 ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-7.77.0.patch 39 ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-8.9.0.patch
39 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 40 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
40 RESULT_VARIABLE Failure 41 RESULT_VARIABLE Failure
41 ) 42 )
42 43
43 if (Failure) 44 if (Failure)
49 ${CURL_SOURCES_DIR}/include 50 ${CURL_SOURCES_DIR}/include
50 ) 51 )
51 52
52 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES) 53 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES)
53 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vauth CURL_SOURCES) 54 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vauth CURL_SOURCES)
55 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vssh CURL_SOURCES)
54 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES) 56 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
57 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vquic CURL_SOURCES)
55 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*) 58 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*)
56 59
57 add_definitions( 60 add_definitions(
58 -DBUILDING_LIBCURL=1 61 -DBUILDING_LIBCURL=1
59 -DCURL_STATICLIB=1 62 -DCURL_STATICLIB=1
80 -DUSE_SSLEAY=1 83 -DUSE_SSLEAY=1
81 ) 84 )
82 endif() 85 endif()
83 86
84 if (NOT EXISTS "${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h") 87 if (NOT EXISTS "${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h")
85 #file(WRITE ${CURL_SOURCES_DIR}/lib/curl_config.h "")
86
87 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h "#include \"../vauth.h\"\n")
88 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/digest.h "#include \"../digest.h\"\n") 88 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/digest.h "#include \"../digest.h\"\n")
89 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/ntlm.h "#include \"../ntlm.h\"\n") 89 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/ntlm.h "#include \"../ntlm.h\"\n")
90 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h "#include \"../vauth.h\"\n")
90 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vtls/vtls.h "#include \"../../vtls/vtls.h\"\n") 91 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vtls/vtls.h "#include \"../../vtls/vtls.h\"\n")
92 file(WRITE ${CURL_SOURCES_DIR}/lib/vssh/curl_setup.h "#include \"../curl_setup.h\"\n")
93 file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/vauth/vauth.h "#include \"../../vauth/vauth.h\"\n")
91 94
92 file(GLOB CURL_LIBS_HEADERS ${CURL_SOURCES_DIR}/lib/*.h) 95 file(GLOB CURL_LIBS_HEADERS ${CURL_SOURCES_DIR}/lib/*.h)
93 foreach (header IN LISTS CURL_LIBS_HEADERS) 96 foreach (header IN LISTS CURL_LIBS_HEADERS)
94 get_filename_component(filename ${header} NAME) 97 get_filename_component(filename ${header} NAME)
95 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/${filename} "#include \"../${filename}\"\n") 98 file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/${filename} "#include \"../${filename}\"\n")
99 file(WRITE ${CURL_SOURCES_DIR}/lib/vquic/${filename} "#include \"../${filename}\"\n")
96 file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/${filename} "#include \"../${filename}\"\n") 100 file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/${filename} "#include \"../${filename}\"\n")
97 endforeach() 101 endforeach()
98 endif() 102 endif()
99 103
100 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR 104 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
107 else() 111 else()
108 SET(TMP_OS "x86") 112 SET(TMP_OS "x86")
109 endif() 113 endif()
110 114
111 set_property( 115 set_property(
112 SOURCE ${CURL_SOURCES} 116 SOURCE ${CURL_SOURCES} APPEND
113 PROPERTY COMPILE_DEFINITIONS "HAVE_CONFIG_H=1;OS=\"${TMP_OS}\"" 117 PROPERTY COMPILE_DEFINITIONS "HAVE_CONFIG_H=1;OS=\"${TMP_OS}\""
114 ) 118 )
115 119
116 include(${CURL_SOURCES_DIR}/CMake/Macros.cmake) 120 include(${CURL_SOURCES_DIR}/CMake/Macros.cmake)
117 121