| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
* upstream-curl:
curl 2020-12-09 (e0528597)
|
| |
|
|
|
| |
* upstream-curl:
curl 2020-06-23 (e9db32a0)
|
| | |
|
| |
|
|
|
| |
* upstream-curl:
curl 2020-03-04 (b8d13668)
|
| |
|
|
|
| |
* upstream-curl:
curl 2018-10-30 (19667715)
|
| |
|
|
|
| |
* upstream-curl:
curl 2018-09-04 (432eb5f5)
|
| |
|
|
|
| |
* upstream-curl:
curl 2018-01-23 (d6c21c8e)
|
| |
|
|
|
| |
* upstream-curl:
curl 2017-10-04 (3ea76790)
|
| |
|
|
|
| |
* upstream-curl:
curl 2016-11-02 (3c561c65)
|
| |
|
|
|
|
|
| |
Resolve conflicts by taking upstream side when possible and otherwise
integrating the changes from both sides. Be carful in CMakeLists.txt
where the OPENSSL code block that we modified previously has moved, and
preserve our previous modifications in the new location.
|
| |
|
|
|
| |
Restore logic originally added by commit v2.8.10~119^2~1 (curl: Make
OpenSSL DLLs available to CMake on Windows, 2012-09-06).
|
| |
|
|
|
|
|
|
|
|
| |
Set curl build options as needed for CMake rather than presenting them
to the user in the cache. Drop the CMAKE_BUILD_CURL_SHARED option for
now.
Change the curl library name to 'cmcurl'. Disable blocks of code within
curl CMakeLists.txt files that we do not need for CMake, but leave the
code in place to make merging with curl updates easier.
|
| |
|
|
|
|
| |
The resource file is only needed for the curl .dll, so skip it when
building the static library. This avoids the need to add the
'/machine:' link flag on MS tools for creating a static library.
|
|
|
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
|
