CMake

Commit Graph

Author	SHA1	Message	Date
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	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	9737ea074a	Install third-party utility copyright notices Some of our third-party utilities have licenses that require their copyright and license notices to be distributed with binary forms. This commit adds installation rules to include these notices with installed CMake documentation.	2009-09-28 11:36:17 -04:00

Author

SHA1

Message

Date

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

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

9737ea074a

Install third-party utility copyright notices

Some of our third-party utilities have licenses that require their
copyright and license notices to be distributed with binary forms.  This
commit adds installation rules to include these notices with installed
CMake documentation.

2009-09-28 11:36:17 -04:00

3 Commits