Skip to content

Commit f1ecb94

Browse files
authored
Update 'CURL' to v8.4.0 (#663)
* Update 'CURL' to v7.88.1 * Update 'CURL' to v8.4.0
1 parent 97a8452 commit f1ecb94

File tree

2 files changed

+48
-11
lines changed

2 files changed

+48
-11
lines changed

cmake/configs/default.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ hunter_default_version(BoringSSL VERSION 0.0.0-0f5ecd3a8-p0)
4646
hunter_default_version(Box2D VERSION 2.3.1-p0)
4747
hunter_default_version(CLAPACK VERSION 3.2.1)
4848
hunter_default_version(CLI11 VERSION 2.3.2)
49-
hunter_default_version(CURL VERSION 7.74.0-p2)
49+
hunter_default_version(CURL VERSION 8.4.0-p0)
5050
hunter_default_version(CapnProto VERSION 0.7.0)
5151
hunter_default_version(Catch VERSION 2.13.9)
5252
hunter_default_version(Clang VERSION 6.0.1-p0)

cmake/projects/CURL/hunter.cmake

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,28 @@ hunter_add_version(
109109
2f5c1a24e34fcced7c0ba8ab9f86859e7bceb63a
110110
)
111111

112+
hunter_add_version(
113+
PACKAGE_NAME
114+
CURL
115+
VERSION
116+
"7.88.1-p0"
117+
URL
118+
"https://github.com/cpp-pm/curl/archive/refs/tags/v7.88.1-p0.tar.gz"
119+
SHA1
120+
a9f16354db1aa33c7635ff6542f03720202cd0ee
121+
)
122+
123+
hunter_add_version(
124+
PACKAGE_NAME
125+
CURL
126+
VERSION
127+
"8.4.0-p0"
128+
URL
129+
"https://github.com/cpp-pm/curl/archive/refs/tags/v8.4.0-p0.tar.gz"
130+
SHA1
131+
ff363d2ab97a46561216682c6295f436c61bec9d
132+
)
133+
112134
if (ANDROID OR IOS OR RASPBERRY_PI OR OPENWRT)
113135
set(_curl_cmake_args
114136
HAVE_FSETXATTR_5=0
@@ -126,16 +148,31 @@ else()
126148
set(_curl_cmake_args "")
127149
endif()
128150

129-
hunter_cmake_args(
130-
CURL
131-
CMAKE_ARGS
132-
BUILD_CURL_TESTS=OFF
133-
BUILD_CURL_EXE=OFF
134-
CMAKE_USE_OPENSSL=ON
135-
CMAKE_USE_LIBSSH2=OFF
136-
BUILD_TESTING=OFF
137-
${_curl_cmake_args}
138-
)
151+
if(HUNTER_CURL_VERSION VERSION_GREATER_EQUAL 7.81.0)
152+
hunter_cmake_args(
153+
CURL
154+
CMAKE_ARGS
155+
BUILD_CURL_TESTS=OFF
156+
BUILD_CURL_EXE=OFF
157+
CURL_USE_OPENSSL=ON
158+
CURL_USE_LIBSSH2=OFF
159+
CURL_DISABLE_LDAP=ON
160+
BUILD_TESTING=OFF
161+
USE_LIBIDN2=OFF
162+
${_curl_cmake_args}
163+
)
164+
else()
165+
hunter_cmake_args(
166+
CURL
167+
CMAKE_ARGS
168+
BUILD_CURL_TESTS=OFF
169+
BUILD_CURL_EXE=OFF
170+
CMAKE_USE_OPENSSL=ON
171+
CMAKE_USE_LIBSSH2=OFF
172+
BUILD_TESTING=OFF
173+
${_curl_cmake_args}
174+
)
175+
endif()
139176

140177
hunter_pick_scheme(DEFAULT url_sha1_cmake)
141178
hunter_cacheable(CURL)

0 commit comments

Comments
 (0)