summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* 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-051-44/+54
| | | | | * upstream-curl: curl 2016-11-02 (3c561c65)
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-031-88/+94
| | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
* 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 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.
* Merge branch 'curl-upstream' into update-curlBrad King2015-08-121-129/+364
| | | | | | | 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>
* curl: Add CURL_CA_PATH option to CMake build processBrad King2015-01-231-5/+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.
* 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-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 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-101-1/+39
| | | | | | | | | | 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: Use arch-aware CHECK_TYPE_SIZE resultsBrad King2014-11-101-54/+8
| | | | | | 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: 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: Port to Haiku againBrad King2014-10-291-0/+2
| | | | | | | 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: Remove unused SIZEOF_LONG_DOUBLEBrad King2014-10-291-1/+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-291-0/+937
| | | | | 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-291-730/+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-291-6/+1
| | | | Remove our "Testing/" directory renames of the upstream examples.
* curl: Move sources back into upstream layoutBrad King2014-10-291-69/+69
| | | | Update our build files as needed to compensate.
* 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-111-2/+2
| | | | | Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'.
* 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}.
* Set policy CMP0025 to NEW while building CMake itselfBrad King2013-10-081-0/+3
| | | | | | | | | | CMake is aware of the policy's NEW behavior and the AppleClang compiler id. Set the policy to NEW explicitly to avoid the warning and get the NEW behavior. Also teach the RunCMake test infrastructure to build tests with -DCMAKE_POLICY_DEFAULT_CMP0025=NEW to avoid the policy warning in test output that must match specific regular expressions.
* Clean up install rules of CMake itself (#14371)Brad King2013-08-261-2/+2
| | | | | | | | | | | Ensure CMAKE_DATA_DIR, CMAKE_DOC_DIR, and CMAKE_MAN_DIR are always relative paths in CMake code, and set defaults accordingly. Use the install() command instead of install_files() and install_targets(). This is more modern and also avoids stripping of the first character from user-specified destinations. While at it, fix the default destinations reported in the bootstrap help.
* cmcurl: Backport curl bug 1192 fix (#14250)Brad King2013-06-271-2/+0
| | | | | | | | | | LLVM headers define strlcat as a macro rather than as a function. See upstream Curl issue: http://curl.haxx.se/bug/view.cgi?id=1192 It was addressed by removing use of strlcat altogether. Port the upstream fix to CMake's curl.
* curl: Make OpenSSL DLLs available to CMake on WindowsBill Hoffman2012-09-071-2/+24
| | | | | Find the OpenSSL runtime DLLs and place them next to the CMake executables in the build tree and the install tree.
* curl: Use find_package(OpenSSL)Bill Hoffman2012-09-071-12/+4
| | | | | Change the code to use the standard CMake FindOpenSSL instead of the handcrafted attempt that was there before.
* cmcurl: Do not hard-coded Windows check results for MinGW (#13001)Brad King2012-03-021-2/+2
| | | | | | The WindowsCache.cmake file hard-codes results for MS and similar Windows toolchains. They are not valid for MinGW tools and also interfere with cmlibarchive checks. Allow the checks to run.
* Merge topic 'HandleTargetsInCMakeRequiredLibraries'David Cole2012-02-211-19/+14
|\ | | | | | | | | | | | | | | 35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 61cb4ea bootstrap: move while() and endwhile() into the bootstrap build c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built 628f365 -remove trailing whitespace
| * -don't pull in CheckTypeSize.cmake from the cmake which is being builtAlex Neundorf2012-02-211-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can be sure that at least cmake 2.6.3 is used when building cmcurl. This means we always get in the first branch of the if(). I think it is not a good idea to pull a cmake module from the cmake which is being built in, since this may use features which are not supported in the cmake which is used to build cmake (e.g. CMAKE_CURRENT_LIST_DIR which does not exist in cmake 2.6.3 which is the minimum for cmcurl). A bit further below there is anyway code to handle the case that cmake is older than 2.8.0, so it should be ok. Alex
| * -remove trailing whitespaceAlex Neundorf2012-02-211-13/+13
| | | | | | | | Alex
* | Add CURL_CA_BUNDLE option for SSL support (#12946)Artur Kedzierski2012-02-091-0/+5
|/ | | | | This adds the ability to specify the location of SSL CA bundle at compile time.
* Require at least CMake 2.6.3 to build current CMakeBrad King2011-02-241-7/+1
| | | | Remove some cruft left for supporting builds with CMake 2.4.
* Ignore strerror_r since CMake isn't threadedBen Boeckel2010-12-161-43/+0
|
* fix build on SUSE 11.2 in cmcurl due to ssize_tAlex Neundorf2010-06-301-0/+1
| | | | Alex
* Add CMAKE_TESTS_CDASH_SERVER variable and CTestSubmitLargeOutput test.David Cole2010-03-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If defined and non-empty, the value of CMAKE_TESTS_CDASH_SERVER should point to a CDash server willing to accept submissions for a project named PublicDashboard. On machines that also run a CDash dashboard, set this variable to "http://localhost/CDash-trunk-Testing" so that the CMake tests that submit dashboards do not have to send those submissions over the wire. The CTestSubmitLargeOutput test runs a dashboard that has a test that produces very large amount of output on stdout/stderr. Since we do not even want to attempt to send such large output over the wire, this test is off by default unless the CMAKE_TESTS_CDASH_SERVER server is localhost. This test is expected to cause a submission failure when sent to CDash. It passes if the submit results contain error output. It fails if the submit succeeds. CMAKE_TESTS_CDASH_SERVER: CDash server used by CMake/Tests. If not defined or "", this variable defaults to the server at http://www.cdash.org/CDash. If set explicitly to "NOTFOUND", curl tests and ctest tests that use the network are skipped. If set to something starting with "http://localhost/", the CDash is expected to be an instance of CDash used for CDash testing, pointing to a cdash4simpletest database. In these cases, the CDash dashboards should be run first.
* cmcurl: Use arch-aware CHECK_TYPE_SIZE resultBrad King2009-12-171-9/+29
| | | | | | | Our new CHECK_TYPE_SIZE macro produces a SIZEOF_<type>_CODE value for use in configured headers to get architecture-aware type size results. In this commit we teach cmcurl to use the SIZEOF_<type>_CODE value to get proper configured type sizes in OS X Universal Binaries.
* cmcurl: Remove unused SIZEOF_LONG_DOUBLEBrad King2009-12-171-1/+0
|
* cmcurl: Fix test and dll output directoriesBrad King2009-12-151-2/+2
| | | | | | | | | | The commit "Clean up CMake build tree 'bin' directory" changed the setting of EXECUTABLE_OUTPUT_PATH that affects the cmcurl directory to empty. We now fix the 'curl' test to refer to the LIBCURL executable locally. When CMAKE_BUILD_CURL_SHARED is enabled we now put cmcurl.dll next to the cmake executable. These changes remove use of EXECUTABLE_OUTPUT_PATH from cmcurl.
* cmcurl: Drop custom CHECK_TYPE_SIZE macroBrad King2009-12-151-7/+1
| | | | | We now require a version of CMake that provides CHECK_TYPE_SIZE, so we do not need a custom one for curl.
* Remove useless include file filtersBrad King2009-12-081-2/+0
| | | | | | | | | | The commit "Cleanup regular expressions" removed real include filter expressions and replaced them with lines like INCLUDE_REGULAR_EXPRESSION("^.*$") that do no filtering. We simplify the change by removing the lines altogether.
* curl: Hard-code HAVE_W* macros on UNIX for CygwinBrad King2009-12-011-0/+6
| | | | | | | | | The curl library code assumes that HAVE_WINDOWS_H and similar macros are not defined on Cygwin. Its CMake code achieved this by not even testing for the corresponding headers on UNIX platforms. However, libarchive does test HAVE_WINDOWS_H and confuses our curl build. We avoid the conflict by hard-coding the macros to 0 for UNIX builds inside the curl tree.
* Install third-party utility copyright noticesBrad King2009-09-281-0/+1
| | | | | | | 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.
* ENH: allow for shared build of libcurl and fix build with openssl option ↵Bill Hoffman2009-04-101-6/+35
| | | | (ssl tested on linux and windows