| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
On Windows, when CMAKE_USE_OPENSSL is OFF, use the OS implementation.
This will allow the OS-configured CA list to be trusted automatically.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Tell MSVC to use its lowest warning level inside curl sources.
|
|
|
|
|
| |
Defining curl APIs as forwarding macros triggers Clang warnings
with -Wdisabled-macro-expansion. Skip this sanity check.
|
| |
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Restore logic originally added by commit v2.8.10~119^2~1 (curl: Make
OpenSSL DLLs available to CMake on Windows, 2012-09-06).
|
|
|
|
|
| |
Restore the option added by commit v2.8.8~200^2 (Add CURL_CA_BUNDLE
option for SSL support, 2012-02-09).
|
| |
|
|
|
|
|
| |
Restore the LIBCURL test used previously within CMake. Restore
installation of the 'COPYING' file with the CMake documentation.
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Choose small or large file support based on capabilities of compiler
and target platform.
|
|
|
|
|
| |
Re-apply the logic change made by commit v2.8.0~1427 (fix warning on
HPUX, 2008-11-26).
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Re-apply change from commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated
preprocessor checks, 2013-10-05) on updated upstream curl.
|
|
|
|
|
|
|
| |
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).
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Re-apply change from commit v2.8.3~265^2~1 (Fix spelling errors
reported by Lintian, 2010-07-02) on updated upstream curl.
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Re-apply change from commit v2.8.2~537 (cmcurl: Remove unused
SIZEOF_LONG_DOUBLE, 2009-12-17) on updated upstream curl.
|
|
|
|
|
| |
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Remove our "Testing/" directory renames of the upstream examples.
|
|
|
|
| |
Update our build files as needed to compensate.
|
|
|
|
|
| |
Add a .gitattributes file to tell Git to skip whitespace checks
in the curl source code.
|
|
|
|
|
| |
CMake 3.0 is the last release to require to be able to build with
Borland.
|
|
|
|
|
| |
Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")'
with the much simpler 'if(NOT DEFINED ${VAR})'.
|
|\
| |
| |
| |
| | |
fd63722d cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|/
|
|
|
|
|
|
|
|
|
|
| |
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}.
|
|
|
|
|
|
| |
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.
|
|\
| |
| |
| |
| |
| |
| |
| | |
54ef2be Haiku: Include files cleanup in cmCTest
38d5555 Haiku: Remove outdated preprocessor checks
1dc61f8 Haiku: Remove use of B_COMMON_DIRECTORY
7ebc1cb Haiku: Several fixes to platform module
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Haiku does not define __BEOS__ anymore, so there is no need to guard
these BeOS specific workaround for Haiku.
* The workaround themselves are not needed for Haiku as it has much
better POSIX compatibility than BeOS did.
Applied-by: Rolf Eike Beer <eike@sf-mail.de>
|
|\ \
| |/
|/|
| |
| |
| |
| | |
1763c31 Set policy CMP0025 to NEW while building CMake itself
aa53ee5 Add policy CMP0025 for Apple Clang compiler id compatibility
ab65862 Clang: Add separate "AppleClang" compiler id
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
Silence clang -Wsometimes-uninitialized warnings.
|
|/
|
|
| |
From clang's -Wheader-guard.
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
Add missing fclose calls.
Reviewed-by: Igor Murzov <e-mail@date.by>
|
|\
| |
| |
| |
| | |
e643e02 cmcurl: Backport curl bug 1192 fix (#14250)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
API, Borland, MinGW, UNIX, Mac OS X.
|
|/ |
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Find the OpenSSL runtime DLLs and place them next to the CMake
executables in the build tree and the install tree.
|