Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 'CURL' to v8.4.0 #663

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Update 'CURL' to v8.4.0 #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e911a8
Update 'CURL' to v7.88.1
hjmallon Dec 21, 2022
0bbd326
Update 'CURL' to v8.4.0
hjmallon Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/configs/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ hunter_default_version(BoringSSL VERSION 0.0.0-0f5ecd3a8-p0)
hunter_default_version(Box2D VERSION 2.3.1-p0)
hunter_default_version(CLAPACK VERSION 3.2.1)
hunter_default_version(CLI11 VERSION 2.3.2)
hunter_default_version(CURL VERSION 7.74.0-p2)
hunter_default_version(CURL VERSION 8.4.0-p0)
hunter_default_version(CapnProto VERSION 0.7.0)
hunter_default_version(Catch VERSION 2.13.9)
hunter_default_version(Clang VERSION 6.0.1-p0)
Expand Down
57 changes: 47 additions & 10 deletions cmake/projects/CURL/hunter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,28 @@ hunter_add_version(
2f5c1a24e34fcced7c0ba8ab9f86859e7bceb63a
)

hunter_add_version(
PACKAGE_NAME
CURL
VERSION
"7.88.1-p0"
URL
"https://github.com/cpp-pm/curl/archive/refs/tags/v7.88.1-p0.tar.gz"
SHA1
a9f16354db1aa33c7635ff6542f03720202cd0ee
)

hunter_add_version(
PACKAGE_NAME
CURL
VERSION
"8.4.0-p0"
URL
"https://github.com/cpp-pm/curl/archive/refs/tags/v8.4.0-p0.tar.gz"
SHA1
ff363d2ab97a46561216682c6295f436c61bec9d
)

if (ANDROID OR IOS OR RASPBERRY_PI OR OPENWRT)
set(_curl_cmake_args
HAVE_FSETXATTR_5=0
Expand All @@ -126,16 +148,31 @@ else()
set(_curl_cmake_args "")
endif()

hunter_cmake_args(
CURL
CMAKE_ARGS
BUILD_CURL_TESTS=OFF
BUILD_CURL_EXE=OFF
CMAKE_USE_OPENSSL=ON
CMAKE_USE_LIBSSH2=OFF
BUILD_TESTING=OFF
${_curl_cmake_args}
)
if(HUNTER_CURL_VERSION VERSION_GREATER_EQUAL 7.81.0)
hunter_cmake_args(
CURL
CMAKE_ARGS
BUILD_CURL_TESTS=OFF
BUILD_CURL_EXE=OFF
CURL_USE_OPENSSL=ON
CURL_USE_LIBSSH2=OFF
CURL_DISABLE_LDAP=ON
BUILD_TESTING=OFF
USE_LIBIDN2=OFF
${_curl_cmake_args}
)
else()
hunter_cmake_args(
CURL
CMAKE_ARGS
BUILD_CURL_TESTS=OFF
BUILD_CURL_EXE=OFF
CMAKE_USE_OPENSSL=ON
CMAKE_USE_LIBSSH2=OFF
BUILD_TESTING=OFF
${_curl_cmake_args}
)
endif()

hunter_pick_scheme(DEFAULT url_sha1_cmake)
hunter_cacheable(CURL)
Expand Down