summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* curl: Select file APIs on WindowsBrad King2014-11-102-4/+11
| | | | | Choose small or large file support based on capabilities of compiler and target platform.
* curl: Do not use 'dl' on HP-UXBrad King2014-11-101-0/+6
| | | | | Re-apply the logic change made by commit v2.8.0~1427 (fix warning on HPUX, 2008-11-26).
* curl: Simplify if() conditions on check result variablesBrad King2014-10-304-9/+9
| | | | | | | | | | | Remove use of an old hack that takes advantage of the auto-dereference behavior of the if() command to detect if a variable is defined. The hack has the form: if("${VAR} MATCHES "^${VAR}$") where "${VAR}" is a macro argument reference. Use if(DEFINED) instead. This also avoids warnings for CMake Policy CMP0054.
* curl: Remove outdated Haiku preprocessor checksBrad King2014-10-291-1/+1
| | | | | Re-apply change from commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated preprocessor checks, 2013-10-05) on updated upstream curl.
* curl: Port to Haiku againBrad King2014-10-292-1/+3
| | | | | | | 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).
* curl: Drop '-DEV' from version since this is a curl releaseBrad King2014-10-291-1/+1
| | | | | | 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.
* curl: Fix spelling errors reported by LintianBrad King2014-10-291-1/+1
| | | | | Re-apply change from commit v2.8.3~265^2~1 (Fix spelling errors reported by Lintian, 2010-07-02) on updated upstream curl.
* curl: Fix warnings on 64-bit Mac OS X buildBrad King2014-10-291-1/+2
| | | | | Re-apply change from commit v2.6.0~921 (Fix warnings on 64-bit Mac OS X build, 2007-11-05) on updated upstream curl.
* curl: Remove unused SIZEOF_LONG_DOUBLEBrad King2014-10-293-8/+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-29261-24915/+81128
| | | | | Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
* curl: Drop our CMake infrastructure to make room for the upstreamBrad King2014-10-2910-2980/+0
| | | | | | 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.
* curl: Drop unused testing codeBrad King2014-10-2918-1078/+1
| | | | Remove our "Testing/" directory renames of the upstream examples.
* curl: Move sources back into upstream layoutBrad King2014-10-29130-69/+69
| | | | Update our build files as needed to compensate.
* curl: Disable all whitespace checks in third-party codeBrad King2014-10-291-0/+1
| | | | | Add a .gitattributes file to tell Git to skip whitespace checks in the curl source code.
* Remove borland workarounds.Stephen Kelly2014-10-151-5/+0
| | | | | CMake 3.0 is the last release to require to be able to build with Borland.
* cmcurl: Use if(DEFINED) to simplify conditionsBrad King2014-09-112-4/+4
| | | | | Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'.
* Merge topic 'compile-with-cray'Brad King2014-07-171-1/+1
|\ | | | | | | | | fd63722d cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)
| * cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)Chuck Atkins2014-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | The error is caused by a workaround for UNICOS. The workaround incorrectly uses the _CRAYC macro to determine if building for UNICOS. This macro will always be defined for the Cray C and C++ compiler regardless of the target platform, even when building for Linux. The correct macro should be _CRAY, which as per Cray documentation is only defined for UNICOS targeted builds.
* | cmcurl: Include the local curl directories before all others.Raphael Kubo da Costa2014-03-101-2/+5
|/ | | | | | | | | | | | In some cases, it was possible for the include directory of the system-wide libcurl to be added to the include path before cmcurl's, which would result in them being picked up and causing the build to fail if the curl versions differ too much. One way to trigger this is to have OpenSSL installed into a non-default location together with libcurl (/usr/local, for example). If cmcurl is built with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added before -I${PATH_TO_CMCURL}.
* Drop use of configure_file IMMEDIATE optionDaniele E. Domenichelli2013-11-132-4/+2
| | | | | | Since commit 7d47c693 (Drop compatibility with CMake < 2.4, 2013-10-08) we no longer need to use the configure_file IMMEDIATE option to support compatibility modes less than 2.0.
generated by cgit v0.12 at 2024-11-15 00:30:03 (GMT)