summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2023-10-121-30/+21
| | | | | | | * upstream-curl: curl 2023-10-11 (d755a5f7) Issue: #25329
* curl: Set build options the way we need for CMakeBrad King2023-09-221-0/+14
| | | | | Also restore commit a8d91e2719 (curl: Precompile common expensive headers, 2023-06-16) with new curl library target.
* Merge branch 'upstream-curl' into update-curlBrad King2023-09-221-90/+142
| | | | | | | | | | | * upstream-curl: curl 2023-09-13 (6fa1d817) Upstream significantly refactored `lib/CMakeLists.txt`, so take the upstream version of everything except the code added by commit 54cb23c657 (curl: Restore installation of OpenSSL DLLs, 2014-11-03, v3.2.0-rc1~418^2~4). We will apply our customizations again in a follow-up commit.
* curl: Remove curlu library not needed for building within CMakeBrad King2023-08-011-0/+4
|
* Merge branch 'upstream-curl' into update-curlBrad King2023-08-011-0/+15
| | | | | * upstream-curl: curl 2023-07-26 (50490c06)
* curl: Precompile common expensive headersClemens Wasser2023-06-221-0/+4
|
* Merge branch 'upstream-curl' into update-curlBrad King2023-05-301-0/+12
| | | | | * upstream-curl: curl 2023-05-30 (7ab9d437)
* Merge branch 'upstream-curl' into update-curlBrad King2023-03-201-23/+0
| | | | | * upstream-curl: curl 2023-03-20 (b16d1fa8)
* Merge branch 'upstream-curl' into update-curlBrad King2023-02-211-2/+3
| | | | | * upstream-curl: curl 2023-02-20 (046209e5)
* Merge branch 'upstream-curl' into update-curlBrad King2023-01-271-0/+28
| | | | | * upstream-curl: curl 2022-12-21 (c12fb3dd)
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-311-13/+17
| | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
* curl: Set build options the way we need for CMakeBrad King2022-01-071-1/+1
|
* Merge branch 'upstream-curl' into update-curlBrad King2022-01-071-6/+1
| | | | | * upstream-curl: curl 2022-01-05 (801bd513)
* Merge branch 'upstream-curl' into update-curlBrad King2021-05-271-5/+12
| | | | | * upstream-curl: curl 2021-05-26 (6b951a69)
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-11/+2
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* Merge branch 'upstream-curl' into update-curlBrad King2020-06-241-1/+27
| | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
* curl: When building inside CMake, link dependencies as PRIVATEBrad King2020-04-031-1/+1
|
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-1/+6
| | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-311-11/+6
| | | | | * upstream-curl: curl 2018-10-30 (19667715)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-221-19/+15
| | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
* Merge branch 'upstream-curl' into update-curlBrad King2018-01-241-1/+18
| | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e)
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-101-3/+8
| | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
* Merge branch 'upstream-curl' into update-curlBrad King2016-12-051-0/+5
| | | | | * upstream-curl: curl 2016-11-02 (3c561c65)
* Merge branch 'curl-upstream' into update-curlBrad King2015-08-121-23/+5
| | | | | | | 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.
* curl: Restore installation of OpenSSL DLLsBrad King2014-11-101-0/+25
| | | | | Restore logic originally added by commit v2.8.10~119^2~1 (curl: Make OpenSSL DLLs available to CMake on Windows, 2012-09-06).
* curl: Configure build to work within CMakeBrad King2014-11-101-1/+5
| | | | | | | | | | 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.
* curl: Drop inclusion of .rc file for static libBrad King2014-11-101-5/+1
| | | | | | 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.
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-0/+122
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
generated by cgit v0.12 at 2025-09-06 16:26:16 (GMT)