summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2023-10-121-7/+13
| | | | | | | * upstream-curl: curl 2023-10-11 (d755a5f7) Issue: #25329
* Merge branch 'upstream-curl' into update-curlBrad King2023-09-221-1/+37
| | | | | | | | | | | * 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.
* Merge branch 'upstream-curl' into update-curlBrad King2023-03-201-2/+0
| | | | | * upstream-curl: curl 2023-03-20 (b16d1fa8)
* Merge branch 'upstream-curl' into update-curlBrad King2023-02-211-1/+1
| | | | | * upstream-curl: curl 2023-02-20 (046209e5)
* Merge branch 'upstream-curl' into update-curlBrad King2023-01-271-2/+0
| | | | | * upstream-curl: curl 2022-12-21 (c12fb3dd)
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-311-35/+6
| | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
* Merge branch 'upstream-curl' into update-curlBrad King2021-09-151-14/+0
| | | | | * upstream-curl: curl 2021-09-14 (8e82f2a0)
* Merge branch 'upstream-curl' into update-curlBrad King2021-05-271-4/+1
| | | | | * upstream-curl: curl 2021-05-26 (6b951a69)
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-1/+1
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* Merge branch 'upstream-curl' into update-curlBrad King2020-06-241-0/+21
| | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-1/+0
| | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-221-4/+3
| | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
* Merge branch 'curl-upstream' into update-curlBrad King2015-08-121-1/+1
| | | | | | | 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: Remove unused SIZEOF_LONG_DOUBLEBrad King2014-10-291-3/+0
| | | | | Re-apply change from commit v2.8.2~537 (cmcurl: Remove unused SIZEOF_LONG_DOUBLE, 2009-12-17) on updated upstream curl.
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-0/+125
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.