summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-curl'Brad King2017-06-1571-1043/+1515
|\ | | | | | | | | | | | | | | | | a3ef36f1 Merge branch 'upstream-curl' into update-curl 06d6d6c4 curl 2017-06-14 (54b636f1) 91101f10 curl: Update script to get curl 7.54.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !965
| * Merge branch 'upstream-curl' into update-curlBrad King2017-06-1470-1042/+1514
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2017-06-14 (54b636f1) Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt` by disabling CA bundle/path detection for build within CMake. CMake already handles locating a CA bundle/path at runtime.
| | * curl 2017-06-14 (54b636f1)Curl Upstream2017-06-1471-1048/+1517
| | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 54b636f14546d3fde9f9c67c3b32701d78563161 (curl-7_54_1).
| * | curl: Update script to get curl 7.54.1Brad King2017-06-141-1/+1
| | |
* | | Merge topic 'libuv-restore-fmode'Brad King2017-06-151-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 871adefc cmake: Fix default file translate mode when using libuv Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !963
| * | | cmake: Fix default file translate mode when using libuvBrad King2017-06-141-0/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, libuv's one-time initialization changes the C runtime library's `_fmode` setting to `_O_BINARY`, thus causing files to open as binary after that instead of the default `_O_TEXT` mode. See upstream libuv issue 840. Work around the problem by performing libuv initialization early and then restoring `_fmode`. In particular, this currently affects server mode. Without this fix, the `_fmode` setting changes when the server mode initializes libuv. Fixes: #16962
* | | CMake Nightly Date StampKitware Robot2017-06-151-1/+1
| | |
* | | Merge branch 'release-3.9'Brad King2017-06-140-0/+0
|\ \ \
| * \ \ Merge branch 'add-missing-compiler-release-notes' into release-3.9Brad King2017-06-142-1/+22
| |\ \ \
| * \ \ \ Merge branch 'readme-supported-platforms' into release-3.9Brad King2017-06-131-1/+7
| |\ \ \ \
* | \ \ \ \ Merge topic 'add-missing-compiler-release-notes'Brad King2017-06-142-1/+22
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 28756437 Help: Add docs for new compilers supporting language standards. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !966
| * | | | | Help: Add docs for new compilers supporting language standards.Chuck Atkins2017-06-142-1/+22
| |/ / / /
* | | | | Merge topic 'vs-dotnet-custom-reference-tags'Brad King2017-06-148-0/+119
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07ec212a VS: add target property VS_DOTNET_REFERENCEPROP_<refname>_TAG_<tagname> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !960
| * | | | | VS: add target property VS_DOTNET_REFERENCEPROP_<refname>_TAG_<tagname>Michael Stürmer2017-06-138-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16689
* | | | | | Merge topic 'autogen_uc'Brad King2017-06-142-25/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f68ad66 Autogen: Tests: Disable some tests on non ASCII build paths 38e3fc4b Autogen: Tests fix for utf8 paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !959
| * | | | | | Autogen: Tests: Disable some tests on non ASCII build pathsSebastian Holtermann2017-06-132-23/+51
| | | | | | |
| * | | | | | Autogen: Tests fix for utf8 pathsSebastian Holtermann2017-06-121-2/+2
| | | | | | |
* | | | | | | Merge topic 'readme-supported-platforms'Brad King2017-06-141-1/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf2e4bfb README: Update list of supported platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !962
| * | | | | | README: Update list of supported platformsBrad King2017-06-131-1/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Convert to a bullet list. Drop platforms for which we no longer have nightly testing.
* | | | | | CMake Nightly Date StampKitware Robot2017-06-141-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-06-130-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | CMake 3.9.0-rc3v3.9.0-rc3Brad King2017-06-131-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-06-130-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'cuda-dlink-no-deprecated-gpu' into release-3.9Brad King2017-06-133-4/+28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-pkgconfig-list' into release-3.9Brad King2017-06-121-1/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'android-unified-headers' into release-3.9Brad King2017-06-128-16/+72
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'android-unified-headers'Brad King2017-06-138-16/+72
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d00be13 Android: Add support for unified headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !956
| * | | | | | | | Android: Add support for unified headersBrad King2017-06-128-16/+72
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unified headers are preferred as of NDK r15, so use them by default if available and provide an option to use the deprecated headers. Inspired-by: Florent Castelli <florent.castelli@gmail.com> Fixes: #16584
* | | | | | | | Merge topic 'remove-stray-line'Brad King2017-06-131-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae77d976 cmGlobalGenerator: Remove unused line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !955
| * | | | | | | | cmGlobalGenerator: Remove unused lineBrad King2017-06-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an unused line that was left by commit v2.4.0~3946 (set CMAKE_SYSTEM_VERSION for windows, 2003-07-16). Fixes: #16956
* | | | | | | | | Merge topic 'doc-pkgconfig-list'Brad King2017-06-131-1/+7
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70a6cb70 FindPkgConfig: mention that variables will be ;-lists 6610fdbe FindPkgConfig: fix confusing indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !957
| * | | | | | | | FindPkgConfig: mention that variables will be ;-listsRolf Eike Beer2017-06-121-0/+6
| | | | | | | | |
| * | | | | | | | FindPkgConfig: fix confusing indentationRolf Eike Beer2017-06-121-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'cuda-dlink-no-deprecated-gpu'Brad King2017-06-133-4/+28
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 7368ade2 CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !951
| * | | | | | CUDA: When linking device code suppress CUDA 8.0+ deprecation warningsRobert Maynard2017-06-133-4/+28
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA compiler automatic deprecation warnings are pure noise when doing device linking, and should be suppressed to reduce the amount of confusion from users.
* | | | | | CMake Nightly Date StampKitware Robot2017-06-131-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release-3.9'Brad King2017-06-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'android-standalone-no-sysroot-include' into release-3.9Brad King2017-06-091-2/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'android-standalone-unified-api-level' into release-3.9Brad King2017-06-091-5/+28
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'android-standalone-no-sysroot-include'Brad King2017-06-121-2/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22f8a465 Android: Do not pass sysroot include for standalone toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !952
| * | | | | | Android: Do not pass sysroot include for standalone toolchainBrad King2017-06-091-2/+7
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) does not make sense when compiling with a standalone toolchain which is tied to a single API version. Drop the explicit include directory so that the compiler uses its default system include order. Fixes: #16954
* | | | | | Merge topic 'android-standalone-unified-api-level'Brad King2017-06-121-5/+28
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f93bf78 Android: Detect API version of standalone toolchain with unified headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !950
| * | | | | Android: Detect API version of standalone toolchain with unified headersBrad King2017-06-091-5/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A standalone toolchain with unified headers keeps the `__ANDROID_API__` macro in the `bin/clang` launcher instead of in `api-level.h`. Issue: #16954
* | | | | Merge topic 'execute_process-pipeline-results'Brad King2017-06-128-3/+237
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6051ca3 execute_process: Add option to get results of every child Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !702
| * | | | | execute_process: Add option to get results of every childAdam Weisi2017-06-108-3/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `RESULTS_VARIABLE` option to get the results of all children in a pipeline of one or more `COMMAND`s.
* | | | | | Merge topic 'cpack-freebsd-pkg'Brad King2017-06-1210-0/+696
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2042cae9 CPack-FreeBSD: add a generator for FreeBSD pkg(8) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !693
| * | | | | | CPack-FreeBSD: add a generator for FreeBSD pkg(8)Adriaan de Groot2017-06-1010-0/+696
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an option CPACK_ENABLE_FREEBSD_PKG to allow CPack to look for FreeBSD's libpkg / pkg(8). If this is set and the libpkg headers and library are found (which they will be, by default, on any FreeBSD system), then add a FreeBSD pkg(8) generator. The FreeBSD package tool pkg(8) uses tar.xz files (.txz) with two metadata files embedded (+MANIFEST and +COMPACT_MANIFEST). This introduces a bunch of FreeBSD-specific CPACK_FREEBSD_PACKAGE_* variables for filling in the metadata; the Debian generator does something similar. Documentation for the CPack CMake-script is styled after the Debian generator. Implementation notes: - Checks for libpkg -- the underlying implementation for pkg(8) -- and includes FreeBSD package-generation if building CMake on a UNIX host. Since libpkg can be used on BSDs, Linux and OSX, this potentially adds one more packaging format. In practice, this will only happen on FreeBSD and DragonflyBSD. - Copy-paste from cmCPackArchiveGenerator to special-case the metadata generation and to run around the internal archive generation: use libpkg instead. - Generating the metadata files is a little contrived. - Most of the validation logic for package settings is in CPackFreeBSD.cmake, as well as the code that tries to re-use packaging settings that may already be set up for Debian. - libpkg has its own notion of output filename, so we have another contrived bit of code that munges the output file list so that CPack can find the output. - Stick with C++98.
* | | | | | Merge topic 'cuda-compiler-launcher'Brad King2017-06-1213-9/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 414438b2 CUDA: Add option to run the compiler through launcher tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !949
| * | | | | | CUDA: Add option to run the compiler through launcher toolsBrad King2017-06-0913-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CUDA_COMPILER_LAUNCHER` target property like those added for C and CXX by commit v3.4.0-rc1~450^2 (Add options to launch the compiler through tools like ccache or distcc, 2015-06-04). Fixes: #16953
* | | | | | | Merge topic 'FindHTMLHelp-path-suffixes'Brad King2017-06-121-14/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcbecbd2 FindHTMLHelp: Use PATH_SUFFIXES to search under Program Files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !948