CMake

Commit Graph

Author	SHA1	Message	Date
Brad King	1959304295	curl: Configure build to work within CMake 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.	2014-11-10 10:13:37 -05:00
Brad King	b18c904412	curl: Drop inclusion of .rc file for static lib 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.	2014-11-10 10:11:26 -05: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

Author

SHA1

Message

Date

Brad King

1959304295

curl: Configure build to work within CMake

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.

2014-11-10 10:13:37 -05:00

Brad King

b18c904412

curl: Drop inclusion of .rc file for static lib

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.

2014-11-10 10:11:26 -05: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

3 Commits