| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
* upstream-curl:
curl 2017-06-14 (54b636f1)
Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt`
by disabling CA bundle/path detection for build within CMake.
CMake already handles locating a CA bundle/path at runtime.
|
| |
|
|
|
|
|
|
| |
* upstream-curl:
curl 2017-04-19 (d957e218)
Resolve conflicts in `CMakeLists.txt` in favor of the upstream version.
We will re-apply our logic as needed in following commits.
|
| |
|
|
|
| |
* upstream-curl:
curl 2016-12-22 (44b9b4d4)
|
| |
|
|
|
| |
* upstream-curl:
curl 2016-11-02 (3c561c65)
|
| |
|
|
|
| |
Backport curl upstream commit curl-7_50_2~32 (nss: refuse previously
loaded certificate from file, 2016-08-22).
|
| |
|
|
|
| |
* upstream-curl:
curl 2016-08-03 (f2cb3a01)
|
| |
|
|
|
| |
The Debian package checker tool (lintian) detected several typos in
CMake.
|
| |
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
Move CMAKE_USE_OPENSSL and CURL_CA_BUNDLE up to the top of CMake so that
CMake's own sources can know their values. Add the CURL_CA_PATH option
at the top and honor it as part of the curl build.
|
| |
|
|
| |
Tell MSVC to use its lowest warning level inside curl sources.
|
| |
|
|
|
| |
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.
|
| |
|
|
|
|
| |
Re-apply the logic change made by commit v2.8.2~536 (Use arch-aware
CHECK_TYPE_SIZE result, 2009-12-17). The size of some types must be
selected at preprocessing time when building for multiple archs on OS X.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
| |
Choose small or large file support based on capabilities of compiler
and target platform.
|
| |
|
|
|
| |
Re-apply change from commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated
preprocessor checks, 2013-10-05) on updated upstream curl.
|
| |
|
|
|
| |
Re-apply change from commit v2.6.0~921 (Fix warnings on 64-bit Mac OS X
build, 2007-11-05) on updated upstream curl.
|
| |
|
|
|
| |
Re-apply change from commit v2.8.2~537 (cmcurl: Remove unused
SIZEOF_LONG_DOUBLE, 2009-12-17) on updated upstream curl.
|
| |
|
|
|
| |
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
|
|
|
Update our build files as needed to compensate.
|
