summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add missing BUILD_TESTING conditionsBrad King2018-10-241-1/+1
| | | | | | We should not call `add_test` unless `BUILD_TESTING` is enabled. Fixes: #18500
* Merge branch 'update-curl' into release-3.13Brad King2018-10-22112-1857/+2567
|\ | | | | | | Merge-request: !2509
| * curl: Update build within CMake to account for 7.61 changesBrad King2018-10-221-1/+1
| | | | | | | | | | | | | | The_CURL_STATICLIB option was replaced by BUILD_SHARED_LIBS. Drop our own CURL_STATICLIB compile definition because it is now provided by curl's usage requirements.
| * curl: Backport to work with CMake 3.1 againBrad King2018-10-221-2/+3
| | | | | | | | | | | | Curl 7.61.1 requires CMake 3.4 to build from source and also exposes a dependency on OpenSSL imported targets. Revert that part of the changes imported from curl upstream.
| * Merge branch 'upstream-curl' into update-curlBrad King2018-10-22112-1858/+2567
| | | | | | | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
* | curl: add missing type sizes for 'long long' and '__int64'Brad King2018-10-221-0/+6
|/ | | | | | | | | | | | | When generating `curl_config.h`, add size information for `long long` and `__int64` types. These are needed as candidates for defining the `ssize_t` type because on MSVC, `long` is not the same size as `size_t`. This problem did not affect upstream curl because it computes the `ssize_t` type in CMake code where all sizes are available. CMake's port computes it in preprocessor logic because universal binaries on macOS do not know type sizes until compile time. Fixes: #18477
* Merge branch 'upstream-curl' into update-curlBrad King2018-05-18107-1760/+3629
| | | | | * upstream-curl: curl 2018-05-15 (cb013830)
* Merge branch 'upstream-curl' into update-curlBrad King2018-01-24100-4124/+8933
| | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e)
* Fix trivial typos in textluzpaz2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some are user facing. Found using codespell -q 3 --skip="./Utilities" -I .cmake-whitelist.txt` whereby the whitelist contained: ans dum helpfull emmited emmitted buil iff isnt nto ot pathes substract te todays upto whitespaces
* curl: Update build within CMake to account for 7.56 changesBrad King2017-10-102-1/+5
|
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-10143-5793/+7984
| | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
* curl: Fix build on HaikuJérôme Duval2017-06-281-0/+2
| | | | | On Haiku the network functions are in libnetwork, so use it when it exists.
* Merge branch 'upstream-curl' into update-curlBrad King2017-06-1470-1042/+1514
| | | | | | | | | * 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.
* curl: Set TLS/SSL build options the way we need for CMakeBrad King2017-05-111-1/+32
| | | | | | Restore settings to match what we had before resolving conflicts in the latest update. Use native APIs on Windows and Apple. Pass CA bundle/path options.
* curl: Skip building docs within CMakeBrad King2017-05-111-0/+5
|
* Merge branch 'upstream-curl' into update-curlBrad King2017-05-11113-2211/+3567
| | | | | | | | * 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.
* curl: Fix passing _WINSOCKAPI_ macro to compilerBrad King2017-02-071-1/+1
| | | | | | | | | | Define `_WINSOCKAPI_` blank rather than to 1 in order to match the value used by Microsoft's winsock header files. Backported from upstream curl commit 192466e0 (cmake: Fix passing _WINSOCKAPI_ macro to compiler, 2017-01-09). Fixes: #16545
* Merge branch 'upstream-curl' into update-curlBrad King2017-02-07131-2509/+4156
| | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4)
* curl: Disable symbol hiding logic in build for CMakeBrad King2016-12-061-0/+2
| | | | | We already disable the code using `HIDES_CURL_PRIVATE_SYMBOLS`, so skip the code to set it too, thus avoiding unnecessary `message()` calls.
* Merge branch 'upstream-curl' into update-curlBrad King2016-12-05106-1518/+2087
| | | | | * upstream-curl: curl 2016-11-02 (3c561c65)
* curl: Backport certificate reuse fix from 7.50.2Brad King2016-09-071-1/+7
| | | | | Backport curl upstream commit curl-7_50_2~32 (nss: refuse previously loaded certificate from file, 2016-08-22).
* curl: Remove CMake-specific READMEBrad King2016-08-031-66/+0
| | | | | | We will now manage the curl source tree updates using the `Utilities/Scripts/update-curl.bash` script. Drop the README that covered the old method.
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-03259-7415/+11878
| | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
* Fix spelling typos in comments and documentation (#16037)Felix Geyer2016-03-293-3/+3
| | | | | The Debian package checker tool (lintian) detected several typos in CMake.
* curl: Do not use libnetwork on Apple platformsGregor Jasny2015-09-101-0/+8
| | | | | | | Starting with OS X 10.11 there is a library called libnetwork which will be picked up during curl configuration. This breaks backward compatibility of the resulting binaries because libnetwork is not available on older OS X versions.
* curl: Update README-CMake.txt for new snapshotBrad King2015-08-171-4/+4
|
* curl: Update configuration of build within CMakeBrad King2015-08-171-4/+11
| | | | | Update our curl build option settings as needed for CMake to account for differences in curl options from 7.38 to 7.44.
* curl: Fix check for gethostbyname_r with 5 argumentsBrad King2015-08-171-1/+1
| | | | | | Fix the check code to pass 5 arguments instead of 6. This typo was introduced in curl 7.39 but was not noticed because the result of this check is used only if ENABLE_IPV6 is OFF.
* Merge branch 'curl-upstream' into update-curlBrad King2015-08-12181-11416/+14815
| | | | | | | 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: Never consider using Windows APIs on CygwinBrad King2015-03-261-2/+8
| | | | | | | | | Our Windows API header checks are conditioned on if(NOT UNIX) but libarchive checks HAVE_WINDOWS_H anyway so the result leaks into the cache and influenes the curl build. Set the check results to false explicitly for curl when not on Windows to tolerate this. Reported-by: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
* Merge topic 'curl-default-cainfo'Brad King2015-01-262-11/+4
|\ | | | | | | | | | | 0abd3e53 cmake: Use a default CA path when not using system curl 6ce346c5 curl: Add CURL_CA_PATH option to CMake build process
| * curl: Add CURL_CA_PATH option to CMake build processBrad King2015-01-232-11/+4
| | | | | | | | | | | | Move CMAKE_USE_OPENSSL and CURL_CA_BUNDLE up to the top of CMake so that CMake's own sources can know their values. Add the CURL_CA_PATH option at the top and honor it as part of the curl build.
* | Merge topic 'update-curl'Brad King2015-01-231-0/+66
|\ \ | |/ |/| | | | | 53df9bce curl: Add README-CMake.txt
| * curl: Add README-CMake.txtBrad King2015-01-221-0/+66
| | | | | | | | Describe how to update curl from upstream.
* | curl: Use OS X SSL/TLS native implementationBrad King2014-12-181-0/+19
| | | | | | | | | | | | | | | | On OS X, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically. This is supported on OS X 10.6 and above using AppleClang, Clang, and GNU compilers.
* | curl: Use Windows SSL/TLS native implementationBrad King2014-12-121-1/+5
|/ | | | | On Windows, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically.
* curl: Check for OpenSSL headers independentlyBrad King2014-11-171-9/+9
| | | | | | | | Use check_include_file instead of check_include_file_concat to look for OpenSSL headers. They do not need to participate in a sequence of dependent system headers. Also they may cause winsock.h to be included before ws2tcpip.h, causing the latter to not be detected in the sequence.
* curl: Disable warnings to avoid changing 3rd party codeBrad King2014-11-111-0/+4
| | | | Tell MSVC to use its lowest warning level inside curl sources.
* curl: Skip sanity check that triggers Clang warningBrad King2014-11-101-0/+2
| | | | | Defining curl APIs as forwarding macros triggers Clang warnings with -Wdisabled-macro-expansion. Skip this sanity check.
* curl: Disable warnings to avoid changing 3rd party codeBrad King2014-11-101-0/+8
|
* curl: Skip check for inet_pton on WindowsBrad King2014-11-101-0/+7
| | | | | | | Re-apply part of the logic from commit v2.8.0~802 (ENH: allow for shared build of libcurl ..., 2009-04-10) to skip inet_pton on Windows. On versions of Windows prior to Vista the function is not available at runtime.
* 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: Restore CURL_CA_BUNDLE optionBrad King2014-11-101-0/+7
| | | | | Restore the option added by commit v2.8.8~200^2 (Add CURL_CA_BUNDLE option for SSL support, 2012-02-09).
* curl: Restore CMake-specific zlib selection codeBrad King2014-11-101-1/+14
|
* curl: Restore CMake-specific test and install codeBrad King2014-11-101-0/+12
| | | | | Restore the LIBCURL test used previously within CMake. Restore installation of the 'COPYING' file with the CMake documentation.
* curl: Configure build to work within CMakeBrad King2014-11-102-2/+44
| | | | | | | | | | 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: Fix curl.h inclusion of curlbuild.h from CMake sourcesBrad King2014-11-101-1/+1
| | | | | | 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.
* curl: Use arch-aware CHECK_TYPE_SIZE resultsBrad King2014-11-103-87/+72
| | | | | | 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.
* curl: Fix detection of headers with dependenciesBrad King2014-11-101-1/+1
| | | | | | Restore the check_include_file_concat functionality broken in upstream curl. The <net/if.h> header on older OS X versions depends on <sys/socket.h> begin included first, for example.
* 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.
generated by cgit v0.12 at 2024-11-14 03:08:22 (GMT)