mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-13 18:00:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
62,631 Commits 2 Branches 385 Tags
e48dbbf048604397ec00a2f95600e57b57634577
Commit Graph

38 Commits

Author SHA1 Message Date
Brad King
a6c9b53273 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2023-05-30 (7ab9d437)
 2023-05-30 09:39:43 -04:00
Brad King
e3dc4df9b9 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2023-03-20 (b16d1fa8)
 2023-03-20 16:40:49 -04:00
Brad King
ce1550f178 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2023-02-20 (046209e5)
 2023-02-21 10:04:36 -05:00
Brad King
f9f5957884 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-12-21 (c12fb3dd)
 2023-01-27 15:58:44 -05:00
Brad King
9ffe6b0969 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-10-26 (cd95ee9f)
 2022-10-31 16:11:41 -04:00
Brad King
71747a28ea Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-05-11 (462196e6)
 2022-05-16 11:43:51 -04:00
Brad King
30aba1ce8c Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-04-27 (1669b17d)
 2022-04-28 15:21:23 -04:00
Brad King
697e8871a1 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-01-05 (801bd513)
 2022-01-07 11:41:57 -05:00
Brad King
5b117bddd0 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-09-22 (c7aef0a9)
 2021-09-24 10:04:49 -04:00
Brad King
8ecd95845c Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-09-14 (8e82f2a0)
 2021-09-15 15:28:38 -04:00
Brad King
cd40922edb Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-05-26 (6b951a69)
 2021-05-27 15:23:20 -04:00
Brad King
426ef61cc8 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-02-03 (2f33be81)
 2021-02-03 11:55:06 -05:00
Brad King
54931fdff0 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-12-09 (e0528597)
 2020-12-09 11:45:25 -05:00
Brad King
7d0fa4a943 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-08-19 (9d954e49)
 2020-08-19 12:50:05 -04:00
Brad King
6d423195d5 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-06-30 (5a1fc8d3)
 2020-07-01 10:10:23 -04:00
Brad King
0ef8fa5000 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-06-23 (e9db32a0)
 2020-06-24 08:13:02 -04:00
Brad King
d61c3bd505 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-03-04 (b8d13668)
 2020-03-04 14:34:39 -05:00
Brad King
a39138ef9a Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2019-05-22 (885ce314)
 2019-05-22 14:15:06 -04:00
Brad King
636bcefeab Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-10-30 (19667715)
 2018-10-31 09:46:23 -04:00
Brad King
e9e8dcee6b Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-09-04 (432eb5f5)
 2018-10-22 08:48:58 -04:00
Brad King
3e913b819d Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-05-15 (cb013830)
 2018-05-18 10:16:50 -04:00
Brad King
cd8e31a1bf Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-01-23 (d6c21c8e)
 2018-01-24 14:18:16 -05:00
Brad King
9e3ef40edb Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2017-10-04 (3ea76790)
 2017-10-10 11:15:16 -04:00
Brad King
a3ef36f153 Merge branch 'upstream-curl' into update-curl 
* 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.
 2017-06-14 11:10:22 -04:00
Brad King
299975908a Merge branch 'upstream-curl' into update-curl 
* 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.
 2017-05-11 11:27:21 -04:00
Brad King
1df9d5f919 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2016-12-22 (44b9b4d4)
 2017-02-07 11:38:00 -05:00
Brad King
f8a1ba202f Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2016-11-02 (3c561c65)
 2016-12-05 11:50:43 -05:00
Brad King
f53f4a8a2d Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2016-08-03 (f2cb3a01)
 2016-08-03 14:26:53 -04:00
Brad King
91e8d35ab8 Merge branch 'curl-upstream' into update-curl 
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.
 2015-08-12 15:43:52 -04:00
Brad King
a427ed0cb8 curl: Skip sanity check that triggers Clang warning 
Defining curl APIs as forwarding macros triggers Clang warnings
with -Wdisabled-macro-expansion.   Skip this sanity check.
 2014-11-10 10:13:39 -05:00
Brad King
cf54aebb96 curl: Fix curl.h inclusion of curlbuild.h from CMake sources 
Use a CMake-specific path to this configured header so that it works
when included from a CMake source file in addition to curl sources.
We do not install the Curl headers with CMake, so this hack is okay.
 2014-11-10 10:13:37 -05:00
Brad King
c17e3207fb curl: Use arch-aware CHECK_TYPE_SIZE results 
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.
 2014-11-10 10:13:37 -05:00
Brad King
4063f26b65 curl: Port to Haiku again 
Re-apply change from commit v2.8.0~1683 (add initial support for HAIKU
OS, 2008-09-15) on updated upstream curl.  However, leave out the part
that was reverted by commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated
preprocessor checks, 2013-10-05).
 2014-10-29 16:43:45 -04:00
Brad King
53b8df596f curl: Drop '-DEV' from version since this is a curl release 
We imported curl from an upstream release, so report the corresponding
release version to servers.  This is consistent with the version we
presented when our builtin curl was 7.16.1.
 2014-10-29 16:43:41 -04:00
Brad King
392a318862 curl: Fix spelling errors reported by Lintian 
Re-apply change from commit v2.8.3~265^2~1 (Fix spelling errors
reported by Lintian, 2010-07-02) on updated upstream curl.
 2014-10-29 16:43:37 -04:00
Brad King
80c881f793 Merge branch 'curl-upstream' into update-curl 
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
 2014-10-29 16:43:21 -04:00
Brad King
ff67d2b579 curl: Drop our CMake infrastructure to make room for the upstream 
Remove our curl CMake build files since upstream now provides some.
After merging the upstream versions we may then port them to build
inside CMake and take code from our old build files as needed.
 2014-10-29 16:42:10 -04:00
Brad King
9cf069f88b curl: Move sources back into upstream layout 
Update our build files as needed to compensate.
 2014-10-29 16:41:10 -04:00