summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-curl'Brad King2014-11-10327-42491/+94751
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c02c747b Tests: Update expected CTestTestFailedSubmit output a427ed0c curl: Skip sanity check that triggers Clang warning 17b24d55 curl: Disable warnings to avoid changing 3rd party code 4c3bd340 curl: Skip check for inet_pton on Windows 54cb23c6 curl: Restore installation of OpenSSL DLLs c50f0327 curl: Restore CURL_CA_BUNDLE option 681693c9 curl: Restore CMake-specific zlib selection code 10d80b68 curl: Restore CMake-specific test and install code 19593042 curl: Configure build to work within CMake cf54aebb curl: Fix curl.h inclusion of curlbuild.h from CMake sources c17e3207 curl: Use arch-aware CHECK_TYPE_SIZE results 1f7cb7e2 curl: Fix detection of headers with dependencies b18c9044 curl: Drop inclusion of .rc file for static lib 860f0a2d curl: Select file APIs on Windows 5a3b55ed curl: Do not use 'dl' on HP-UX 59242702 curl: Simplify if() conditions on check result variables ...
| * Tests: Update expected CTestTestFailedSubmit outputBrad King2014-11-101-0/+1
| | | | | | | | Add another error message that curl now produces.
| * 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-103-6/+45
| | | | | | | | | | | | | | | | | | | | 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 7.38.0 (reduced)Curl Upstream2014-10-08261-24959/+81174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream curl using the following shell code. url=git://github.com/bagder/curl.git && v=7.38.0 && r=202aa9f7 && paths=" CMake/* CMakeLists.txt COPYING include/curl/*.h include/curl/curlbuild.h.cmake lib/*.c lib/*.h lib/CMakeLists.txt lib/Makefile.inc lib/curl_config.h.cmake lib/libcurl.rc lib/vtls/*.c lib/vtls/*.h " && mkdir curl-$v-g$r-reduced && git clone $url curl-git && date=$(cd curl-git && git log -n 1 --format='%cd' $r) && (cd curl-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd curl-$v-g$r-reduced && tar xv && rm lib/config-*.h) && echo "g$r date: $date"
| * | 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.
| * | Merge branch 'curl-upstream' into update-curlBrad King2014-10-290-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Use the '-s ours' merge strategy to keep our side unchanged. This merge brings in the upstream snapshot as of the version of curl on which our source is based. This will allow new snapshots to be merged with our changes.
| | * curl 7.16.1 (reduced)Curl Upstream2014-10-08129-0/+50290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream curl using the following shell code. url=git://github.com/bagder/curl.git && v=7.16.1 && r=ef442d58 && paths=" COPYING include/curl/*.h lib/*.c lib/*.h " && mkdir curl-$v-g$r-reduced && git clone $url curl-git && date=$(cd curl-git && git log -n 1 --format='%cd' $r) && (cd curl-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd curl-$v-g$r-reduced && tar xv && rm lib/config-*.h) && echo "g$r date: $date"
| * 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-29131-70/+70
| | | | | | | | 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.
* | Merge topic 'make-fortran-preprocessor-assembly-targets'Brad King2014-11-1013-33/+95
|\ \ | | | | | | | | | | | | | | | b6b37e30 Makefile: Add assembly and preprocessed targets for Fortran 0842b084 Makefile: Refactor checks for lang-specific targets and export compile cmds
| * | Makefile: Add assembly and preprocessed targets for FortranTim Gallagher2014-11-1013-15/+65
| | | | | | | | | | | | Extend the FortranOnly test to cover "make <src>.i" targets.
| * | Makefile: Refactor checks for lang-specific targets and export compile cmdsTim Gallagher2014-11-052-22/+34
| | | | | | | | | | | | | | | | | | The checks are now split into languages that are able to generate assembly listings, languages that are able to generate preprocessed listings, and languages that are able to export the compile commands.
* | | Merge topic 'encoding-curl'Brad King2014-11-101-0/+38
|\ \ \ | | | | | | | | | | | | | | | | e63dcb13 Encoding: Use encoding libcurl expects with file: urls.
| * | | Encoding: Use encoding libcurl expects with file: urls.Clinton Stimpson2014-11-051-0/+38
| |/ / | | | | | | | | | | | | | | | | | | | | | For unescaped file: URLs on Windows, libcurl expects the ANSI code page. This fixes the CMake.FileUpload test when CMake is configured to use UTF-8 internally with a non-ascii build directory name.
* | | Merge topic 'file-GENERATE-permissions'Brad King2014-11-107-3/+37
|\ \ \ | | | | | | | | | | | | | | | | 81afbbc0 file(GENERATE): Use permissions of input file if present.
| * | | file(GENERATE): Use permissions of input file if present.Stephen Kelly2014-11-047-3/+37
| | | |
* | | | Merge topic 'fix-gcc-hppa'Brad King2014-11-102-16/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 04f442f7 Workaround for short jump tables on PA-RISC.
| * | | | Workaround for short jump tables on PA-RISC.Chuck Atkins2014-11-102-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PA-RISC architecture requires special options for GCC to prevent linker errors when libraries reach a certain size and / or complexity. See http://mraw.org/blog/2007/10/10/Linking_on_hppa and gcc documentation on -mlong-calls.
* | | | | Merge topic 'genex-target-objects-ordering'Brad King2014-11-101-4/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | caa4b7b8 genex: Preserve order while evaluating TARGET_OBJECTS
| * | | | | genex: Preserve order while evaluating TARGET_OBJECTSClinton Stimpson2014-11-071-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic introduced in commit v3.1.0-rc1~688^2~9 (Genex: Evaluate TARGET_OBJECTS as a normal expression, 2014-02-26) ordered a map by pointer value and then constructed a list of object files by iterating over the map. This is not deterministic. Since commit v3.1.0-rc1~688^2~5 (cmTarget: Allow any generator expression in SOURCES property, 2014-03-18) the order produced by the above-mentioned logic started being used for the actual list of object files on the link line. Since it is not deterministic, spurious re-links occur after re-running CMake simply because the order of objects changed on the link line. Fix this by iterating over the original vector of source files instead of the map. This has a deterministic order.
* | | | | | Merge topic 'xcode-ios-compiler-id'Brad King2014-11-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f89552a Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)
| * | | | | | Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)Brad King2014-11-071-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~1^2~1 (Xcode: Fix compiler id detection for iOS tools, 2014-10-22) our compiler id detection project sets the product type to 'com.apple.product-type.bundle.unit-test'. This causes the Ld command line on which we match the path to the compiler to have a 'CompilerIdC.xctest/' component. The commit updated our regex to match this, but placed it before the extra './' component that Xcode 5.0 and below produce. Xcode <= 5.0 prints '/./CompilerIdC.xctest/', so switch the order of the two components in the regex to match it.
* | | | | | CMake Nightly Date StampKitware Robot2014-11-101-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-11-091-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-11-081-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2014-11-070-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-cleanup-xrefs' into releaseBrad King2014-11-076-6/+8
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'doc-cleanup-xrefs'Brad King2014-11-076-6/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 4c8c442d Help: Fix broken cross-references reported by 'nitpicky' option
generated by cgit v0.12 at 2025-01-23 00:16:46 (GMT)