summaryrefslogtreecommitdiffstats
path: root/Utilities
Commit message (Collapse)AuthorAgeFilesLines
* Utilities/Release: Build OS X and Win binaries without OpenSSLBrad King2015-02-182-12/+2
| | | | This will tell our curl to use the OS-native TLS/SSL APIs.
* CMake 3.2.0-rc1 version updateBrad King2015-02-051-1/+1
|
* 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.
* | Add option to build CMake against a system jsoncppBrad King2015-01-204-3/+19
| | | | | | | | Create a CMAKE_USE_SYSTEM_JSONCPP option.
* | jsoncpp: Add headers to help CMake include in-source jsoncpp headersBrad King2015-01-202-0/+36
| | | | | | | | | | | | Add cm_jsoncpp_value.h and cm_jsoncpp_writer.h headers to include the CMake-provided copy of the json/value.h and json/writer.h headers from CMake sources.
* | jsoncpp: Drop doxygen comments that cause Clang warningsBrad King2015-01-202-3/+0
| | | | | | | | | | | | Even though we disable warnings when building jsoncpp itself, including its headers from other CMake sources may still cause warnings. Update the code to remove these -Wdocumentation warnings.
* | Merge topic 'libarchive-constify-internal-get_date'Brad King2015-01-161-4/+4
|\ \ | | | | | | | | | | | | 6b9a0e17 libarchive: Constify internal __archive_get_date implementation
| * | libarchive: Constify internal __archive_get_date implementationBrad King2015-01-151-4/+4
| | | | | | | | | | | | | | | The caller of this API already re-declares it as const, so update the implementation accordingly.
* | | Merge topic 'import-jsoncpp'Brad King2015-01-1622-0/+6383
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89cd3d27 jsoncpp: Add README-CMake.txt 7e310624 jsoncpp: Provide 'isfinite' implementation on Solaris 4c496065 jsoncpp: Provide 'isfinite' implementation on ancient glibc 50032bc8 jsoncpp: Add missing assert before strcmp in json_value.cpp ad94b052 jsoncpp: Add missing <iosfwd> include in json/writer.h 7eba04fd jsoncpp: Include C headers since we use APIs without std:: 06f41e98 jsoncpp: Disable warnings to avoid changing 3rd party code 1fc55653 jsoncpp: Build the library within CMake 84d5674d jsoncpp: Include "config.h" before system headers a263d519 Merge branch 'jsoncpp-upstream' into import-jsoncpp 53f6ccb0 JsonCpp 1.0.0 (reduced) 32fd56b0 jsoncpp: Add .gitattributes to skip whitespace checks
| * | | jsoncpp: Add README-CMake.txtBrad King2015-01-151-0/+66
| | | | | | | | | | | | | | | | Describe how to update jsoncpp from upstream.
| * | | jsoncpp: Provide 'isfinite' implementation on SolarisBrad King2015-01-151-0/+6
| | | | | | | | | | | | | | | | Solaris provides a 'finite' function in <ieeefp.h>.
| * | | jsoncpp: Provide 'isfinite' implementation on ancient glibcBrad King2015-01-151-0/+7
| | | | | | | | | | | | | | | | | | | | The glibc 2.1 headers provide isfinite only in C99 mode. Add its definition ourselves.
| * | | jsoncpp: Add missing assert before strcmp in json_value.cppBrad King2015-01-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | The strcmp function does not allow NULL pointers, so add an assert to tell Clang scan-build that the code does not expect a NULL pointer.
| * | | jsoncpp: Add missing <iosfwd> include in json/writer.hBrad King2015-01-151-0/+1
| | | | | | | | | | | | | | | | The header uses std::ostream, so it must be declared.
| * | | jsoncpp: Include C headers since we use APIs without std::Brad King2015-01-152-5/+5
| | | |
| * | | jsoncpp: Disable warnings to avoid changing 3rd party codeBrad King2015-01-152-0/+12
| | | | | | | | | | | | | | | | | | | | Add '-w' or equivalent flag on compilers supporting it. Tell MSVC to use its lowest warning level inside jsoncpp sources.
| * | | jsoncpp: Build the library within CMakeBrad King2015-01-154-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update json/json.h to account for our lack of autolink.h. Update json/config.h to include KWSys Large File Support configuration so that consistent stream libraries are used (on AIX with XL). Add a cm_jsoncpp_reader.h header to include the CMake-provided copy of the json/reader.h header from CMake sources.
| * | | jsoncpp: Include "config.h" before system headersBrad King2015-01-151-2/+2
| | | |
| * | | Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-1318-0/+6249
| | | | | | | | | | | | | | | | | | | | Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.
| * | | jsoncpp: Add .gitattributes to skip whitespace checksBrad King2015-01-131-0/+1
| |/ /
* | | zlib: Disable warnings to avoid changing 3rd party codeBrad King2015-01-141-0/+8
|/ /
* | Utilities/Release: Build Windows and OS X binaries with native SSLBrad King2014-12-222-2/+12
| | | | | | | | | | | | For the nightly binaries, turn of CMAKE_USE_OPENSSL on Windows and OS X 10.6+ platforms. This will activate the new curl behavior to use the OS-native SSL/TLS implementation.
* | Utilities/Release: Fix name of OS X 10.6+ x86_64-only binaryBrad King2014-12-221-2/+2
| | | | | | | | | | | | | | | | In commit v3.1.0-rc1~52^2 (Make the OSX 10.6+ release x86_64 only, 2014-09-29) we forgot to remove the name "universal" from the binary name. Since the binary is no longer universal, use "x86_64" instead. While at it, update the deployment target to actually be 10.6.
* | 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.
* | Rename header guards to not start with double underscoreSean McBride2014-12-119-19/+19
| | | | | | | | | | | | | | | | | | Use regex to find/replace: __(cm.*_h) \1 Then fix QCMake.h by hand.
* | Merge topic 'doc-mixed-case-commands'Brad King2014-12-041-2/+10
|\ \ | | | | | | | | | | | | 607b39dc Utilities/Sphinx: Fix link targets for mixed-case command names
| * | Utilities/Sphinx: Fix link targets for mixed-case command namesBrad King2014-12-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | When a CMake domain 'command' object is defined by CMakeTransform or the 'cmake:command' directive, generate the link target with a lower-case name even if the command name is not all lower-case. This is needed to make cross-references to the command definition work since the 'cmake:command' role is marked with the 'lowercase' property.
* | | Utilities/Release: Add build of binary for Linux x86_64Brad King2014-12-022-0/+24
| | |
* | | ccmake: Add CMAKE_USE_SYSTEM_FORM option to use libform instead of cmFormÅdne Hovda2014-11-251-0/+1
| | |
* | | Merge topic 'update-curl'Brad King2014-11-181-9/+9
|\ \ \ | | |/ | |/| | | | | | | 46bbf947 curl: Check for OpenSSL headers independently
| * | 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.
* | | Merge topic 'doc-sphinx-cmake-fixup'Brad King2014-11-181-0/+1
|\ \ \ | | |/ | |/| | | | | | | 5cda2205 Utilities/Sphinx: Add missing call to note_explicit_target
| * | Utilities/Sphinx: Add missing call to note_explicit_targetBrad King2014-11-171-0/+1
| | | | | | | | | | | | | | | | | | Sphinx calls document.note_explicit_target with any nodes.target() it creates. Add such a call when we create a document target in CMakeTransform.
* | | Merge topic 'update-curl'Brad King2014-11-121-0/+4
|\ \ \ | | |/ | |/| | | | | | | 3dd26463 curl: Disable warnings to avoid changing 3rd party code
| * | 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.
* | | Merge topic 'doc-index-xrefs'Brad King2014-11-122-3/+47
|\ \ \ | | |/ | |/| | | | | | | 7ca9a459 Utilities/Sphinx: Add index entries for cross-references
| * | Utilities/Sphinx: Add index entries for cross-referencesBrad King2014-11-122-3/+47
| | | | | | | | | | | | | | | | | | | | | Add a document transform to insert index and target nodes just before any CMake domain cross-reference node. This will make references to CMake domain objects appear in the index. Also add a comment explaining why it cannot be done in a result_nodes method of the CMakeXRefRole.
* | | Merge topic 'update-curl'Brad King2014-11-10325-42487/+94749
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | 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.