Commit Graph

76 Commits

Author SHA1 Message Date
Brad King 8b51762426 curl: Honor OPENSSL_NO_SSL2
Some OpenSSL distributions have dropped support for the ancient SSLv2
protocol completely.  Port changes from upstream curl to recognize this
case and avoid using it.
2012-09-07 13:24:14 -04:00
Bill Hoffman bc0e8c28ec curl: Make OpenSSL DLLs available to CMake on Windows
Find the OpenSSL runtime DLLs and place them next to the CMake
executables in the build tree and the install tree.
2012-09-07 11:07:31 -04:00
Bill Hoffman c2f47590ef curl: Use find_package(OpenSSL)
Change the code to use the standard CMake FindOpenSSL instead of the
handcrafted attempt that was there before.
2012-09-07 11:03:19 -04:00
Brad King 2d59c9ab17 cmcurl: Do not hard-coded Windows check results for MinGW (#13001)
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.
2012-03-02 10:15:06 -05:00
David Cole 8ef15df700 Merge topic 'HandleTargetsInCMakeRequiredLibraries'
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
2012-02-21 15:58:27 -05:00
Alex Neundorf c9f2886b3d -don't pull in CheckTypeSize.cmake from the cmake which is being built
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
2012-02-21 15:33:39 -05:00
Alex Neundorf 628f365140 -remove trailing whitespace
Alex
2012-02-21 15:33:31 -05:00
Artur Kedzierski ed14435b23 Add CURL_CA_BUNDLE option for SSL support (#12946)
This adds the ability to specify the location of SSL CA bundle at
compile time.
2012-02-09 09:09:54 -05:00
Brad King 9a7c6a3cc4 Merge topic 'require-cmake-2.6.3'
c3e452e Require at least CMake 2.6.3 to build current CMake
2011-03-01 15:30:38 -05:00
Brad King c3e452e944 Require at least CMake 2.6.3 to build current CMake
Remove some cruft left for supporting builds with CMake 2.4.
2011-02-24 15:14:08 -05:00
Modestas Vainius 7c5e412c4a Documentation: Fix a few typos (#11883)
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 10029: warning [p 158, 13.5i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz informations information
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz dependant dependent
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cmake prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cpack prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/ctest prefered preferred
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakepolicies.1.gz prefered preferred
I: cmake-curses-gui: spelling-error-in-binary ./usr/bin/ccmake prefered preferred
I: cmake-qt-gui: spelling-error-in-binary ./usr/bin/cmake-gui prefered preferred
2011-02-22 17:24:51 -05:00
Ben Boeckel 7e0b001466 Fix missed _POLL_EMUL_H_ and HAVE_POLL combo 2010-12-17 11:41:30 -05:00
Ben Boeckel 8a61950e42 Toss out strerror_r macros 2010-12-17 11:31:15 -05:00
Ben Boeckel 44fca8b51a Check for poll when looking for _POLL_EMUL_H_ 2010-12-17 11:18:49 -05:00
Ben Boeckel 8d36890723 Use _POLL_EMUL_H_ instead of HAVE_POLL_FINE
Headers define _POLL_EMUL_H_ if they are not in the kernel, so a try_run
check for them is not necessary.
2010-12-16 14:59:05 -05:00
Ben Boeckel c5cbb318c5 Ignore strerror_r since CMake isn't threaded 2010-12-16 14:58:05 -05:00
Brad King 87fde60563 Suppress -Wcast-align in curl and bzip2
Trust upstream developers of third-party code.
2010-09-10 09:00:48 -04:00
Brad King e1a4c02bac Merge topic 'resolve/doc-spelling/CPackRPM'
7739d78 Merge CPackRPM changes into doc-spelling
9203e91 Fix spelling errors reported by Lintian.
2010-07-20 16:00:29 -04:00
Kai Wasserbäch 9203e9187e Fix spelling errors reported by Lintian.
During a Lintian run on the binary packages of CMake in Debian I was
notified of many spelling mistakes.
2010-07-13 09:41:37 -04:00
Alex Neundorf 421952c7d8 fix build on SUSE 11.2 in cmcurl due to ssize_t
Alex
2010-06-30 19:27:26 +02:00
David Cole a61c5ab6e5 Add CMAKE_TESTS_CDASH_SERVER variable and CTestSubmitLargeOutput test.
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.
2010-03-08 13:25:58 -05:00
Brad King ba7ccc8bf4 cmcurl: Use arch-aware CHECK_TYPE_SIZE result
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.
2009-12-17 15:16:13 -05:00
Brad King 5d4a07462d cmcurl: Remove unused SIZEOF_LONG_DOUBLE 2009-12-17 15:15:53 -05:00
Brad King 633c296552 cmcurl: Fix test and dll output directories
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.
2009-12-15 14:32:39 -05:00
Brad King 93407682fe cmcurl: Drop custom CHECK_TYPE_SIZE macro
We now require a version of CMake that provides CHECK_TYPE_SIZE, so we
do not need a custom one for curl.
2009-12-15 14:20:28 -05:00
Brad King d4e26b7e88 Remove useless include file filters
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.
2009-12-08 11:27:38 -05:00
Brad King 997fd839ed curl: Hard-code HAVE_W* macros on UNIX for Cygwin
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.
2009-12-01 12:03:32 -05: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
Brad King 6f109620b3 COMP: Fix cmcurl build on VMS
This defines IOCTL_3_ARGS in 'cmcurl/setup.h' to teach curl sources
about the three-argument ioctl() on VMS.
2009-06-10 11:49:23 -04:00
Bill Hoffman 5783d5aab1 ENH: allow for shared build of libcurl and fix build with openssl option (ssl tested on linux and windows 2009-04-10 11:59:31 -04:00
Bill Hoffman 4b879a7593 ENH: disable ftp check because it is no longer active on public 2008-12-02 16:40:04 -05:00
Bill Hoffman 7c39cdc80d ENH: fix warning on HPUX 2008-11-26 16:19:27 -05:00
Bill Hoffman 0aa05cf714 ENH: missed this one, cmake now bootstraps on HAIKU 2008-09-15 18:23:37 -04:00
Bill Hoffman 64fc597de2 ENH: add initial support for HAIKU OS from bug# 7425 2008-09-15 17:53:28 -04:00
Brad King 129f3bef2d COMP: Check for -Wno-long-double before using
Older GCC on the Mac warns for use of long double, so we use
-Wno-long-double.  Newer GCC on the Mac does not have this flag and
gives an error.  We now check for the flag before using it.
See bug #7357.
2008-07-17 15:19:25 -04:00
Brad King eb85676928 ENH: Avoid cmcurl CMake macro name conflicts
Utilities/cmcurl/CMake provides macros with the same file names and
macro names as others in Modules, but with different interfaces.  We
rename the curl ones to avoid conflict.
2008-07-17 15:19:17 -04:00
Brad King 33c84b50e9 ENH: Set CMake Policy CMP0003 to NEW behavior to build without warnings with the upcoming CMake 2.6 release. 2008-03-17 16:22:28 -04:00
Bill Hoffman 4057ee6828 BUG: fix for bug 6054 remove some warnings 2007-12-14 11:00:56 -05:00
Bill Hoffman 333ff59c23 ENH: remove memdebug.c from list 2007-11-07 14:35:56 -05:00
Brad King f410f8578e COMP: Fix warnings on 64-bit Mac OS X build. Patch from issue #3697. 2007-11-05 14:34:36 -05:00
Bill Hoffman 8edcbecb7a ENH: add a check for basename to cmcurl 2007-09-27 08:53:19 -04:00
Bill Hoffman a581b64330 ENH: add test for HAVE_BASENAME since it is used 2007-09-19 11:42:28 -04:00
Bill Hoffman 9cbb998737 ENH: add support for vs 2008 beta 2 2007-09-17 15:21:47 -04:00
Alexander Neundorf 330062c0ce STYLE: HAVE_LONG_LONG_CONST was completely unused here (it was used in the
(unused) copy of curl under CMake/CTest/Curl/ )

Alex
2007-08-09 14:55:18 -04:00
Bill Hoffman a6c86cbd04 ENH: change order so windows functions are found first since try compile is slow on windows 2007-07-20 12:25:44 -04:00
Brad King 58debfd6bd ENH: Use IF(NOT DEFINED) check to short-circuit size test. 2007-05-17 15:17:45 -04:00
Brad King aa4d7847ee COMP: Fix code-not-reached warnings for SunCC. 2007-05-03 13:03:13 -04:00
Andy Cedilnik 925214e12f ENH: Fix old api 2007-04-15 11:56:07 -04:00
Utkarsh Ayachit 0f6c76b780 ENH: Merging branch PVEE-ERDC-Setup-4-3-2007 to main tree. Changes between PVEE-ERDC-Setup-4-3-2007-bp and PVEE-ERDC-Setup-4-3-2007-mp1 are included. 2007-04-10 17:12:24 -04:00
Bill Hoffman c98d6ad668 ENH: second try to fix qnx build problem 2007-03-20 15:51:42 -04:00