summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2020-04-241-1/+1
|
* Merge topic 'remove-documentation-module'Brad King2020-04-232-2/+37
|\ | | | | | | | | | | | | | | 306a1ba960 Modules/Documentation: remove ad4487a96a cmIncludeCommand: add infrastructure for deprecated modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4617
| * Modules/Documentation: removeBen Boeckel2020-04-222-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | This is an old module from when VTK and other Kitware projects drove the addition of commands and modules into CMake itself. Modern VTK doesn't need this module and it can be ignored. This module is kept around so that the ancient VTK versions which use it are not broken by it. VTK itself stopped using the module in 2012 and the last usage by an example in VTK was removed in 2020. Fixes: #20591
| * cmIncludeCommand: add infrastructure for deprecated modulesBen Boeckel2020-04-211-1/+31
| |
* | CMake Nightly Date StampKitware Robot2020-04-231-1/+1
| |
* | Merge topic 'win-user-manifest-rc'Brad King2020-04-221-3/+12
|\ \ | | | | | | | | | | | | | | | | | | 7ca13e04fa Windows: Merge user-provided manifests into compiled resource Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4484
| * | Windows: Merge user-provided manifests into compiled resourceKenney Phillis2020-04-211-3/+12
| | | | | | | | | | | | | | | | | | Previously we merged user-provided manifests only into the manifest file given to the linker. Merge them into the manifest file that is compiled as a resource too.
* | | Merge topic 'ctest_stop_on_failure_16628'Brad King2020-04-228-1/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e89aeba5c4 ctest: add option --stop-on-failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4630
| * | | ctest: add option --stop-on-failureJohnny Jazeix2020-04-208-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | To stop the tests once one has failed Fixes: #16628
* | | | Merge topic 'update-kwsys'Brad King2020-04-221-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8191d39119 Merge branch 'upstream-KWSys' into update-kwsys e833e660ef KWSys 2020-04-21 (44086372) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4646
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-21 (44086372)
* | | | | Merge topic 'apple-merge-same-sysroot'Brad King2020-04-222-1/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4647
| * | | | | Apple: Merge per-arch sysroot parameters if all are the sameGregor Jasny2020-04-212-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a9b41195d2 (Handle multi-arch sysroots on Apple platforms, 2019-07-26, v3.17.0-rc1~287^2), CMake supports "fat" builds with different sysroots. Those are passed to the compiler with the `-Xarch_<xyz>` parameter. Unfortunately this breaks the Compiler Cache (ccache) because it does not support those compiler flags: https://github.com/ccache/ccache/blob/v3.7.9/src/ccache.c#L2700-L2705 Restore the caching ability for certain "fat" build configurations (e.g. `arm64` and `armv7`) where the sysroot is the same for all selected architectures and thus a plain `-isysroot` parameter could be used.
| * | | | | Merge topic 'ninja-fortran-doc' into release-3.17Brad King2020-04-201-8/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4626
| * \ \ \ \ \ Merge topic 'ibmi-aix-exports' into release-3.17Brad King2020-04-151-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 420e91c951 AIX: Activate symbol export/import IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4611
| * | | | | | | file(UPLOAD): Add default ca_certsHarry Mallon2020-04-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default ca_certs were not added when using `UPLOAD` with built-in (non-system) cURL. Previously we only did this for `DOWNLOAD`. Fixes: #20551
* | | | | | | | Merge topic 'cpack-symlinks'Brad King2020-04-222-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcc5cd44ed CPack: Do not recurse through directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4637
| * | | | | | | | CPack: Do not recurse through directory symlinksBrad King2020-04-212-0/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 7b8dcdd173 (CPack: Do not recurse through directory symlinks (#12284), 2011-08-27, v2.8.6~55^2) to more places in CPack. Issue: #12284
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-221-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'refactor_cmCacheManager'Brad King2020-04-213-287/+153
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80d8b20351 cmCacheManager: Cleanup CacheIterator interface Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4628
| * | | | | | | cmCacheManager: Cleanup CacheIterator interfaceTushar Maheshwari2020-04-183-287/+153
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Expose required functionality from CacheEntry. - Modify usage in cmState member functions. - Remove cmState access to CacheEntry members.
* | | | | | | CMake Nightly Date StampKitware Robot2020-04-211-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'device-link'Brad King2020-04-2015-197/+378
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4248bb452a CUDA: Device linking use now link options ec48e023f6 CUDA: Add information for LINKER: pattern translation 3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK> 38332fc4fa cmGeneratorExpressionDAGChecker: introduce method Top() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4577
| * | | | | | CUDA: Device linking use now link optionsMarc Chevrier2020-04-1910-138/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties LINK_OPTIONS and INTERFACE_LINK_OPTIONS are propagated to the device link step. To control which options are selected for normal link and device link steps, the $<DEVICE_LINK> and $<HOST_LINK> generator expressions can be used. Fixes: #18265
| * | | | | | Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK>Marc Chevrier2020-04-196-11/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These generator expressions can only be used in link options properties. These expressions return the arguments respectively for device and host link step, otherwise return an empty string.
| * | | | | | cmGeneratorExpressionDAGChecker: introduce method Top()Marc Chevrier2020-04-182-48/+25
| |/ / / / /
* | | | | | Merge topic 'update-kwsys'Brad King2020-04-202-7/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6ce851bef Merge branch 'upstream-KWSys' into update-kwsys 363ec4f585 KWSys 2020-04-17 (54845345) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4621
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-172-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-17 (54845345)
* | | | | | | Merge topic 'ninja-fortran-doc'Brad King2020-04-201-8/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2fa7d20b2 Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-doc fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4626
| * \ \ \ \ \ \ Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-docBrad King2020-04-171-8/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Ninja: Document that Fortran support is available with Ninja 1.10+Brad King2020-04-171-8/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.10 was released in Jan 2020 and has the features we need to support Fortran. Replace documentation that mentions Kitware's branch with mention of Ninja 1.10+ instead.
| | * | | | CMake 3.17.1v3.17.1Brad King2020-04-091-1/+1
| | | | | |
| | * | | | Merge topic 'ccmake_incremental_log_display' into release-3.17Brad King2020-04-094-19/+48
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60bfaa8fe6 ccmake: Use incremental rendering for the logs e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4573
| | * \ \ \ \ Merge topic 'apple-arch-sysroots' into release-3.17Brad King2020-04-092-11/+29
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES 45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4583
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-201-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'ctest-memcheck-sanitizers'Craig Scott2020-04-191-8/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e03d3c08f0 CTest: Fix '-T MemCheck' command-line support for sanitizers 82b6091776 Tests: Fix RunCMake.ctest_memcheck test script syntax errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4618
| * | | | | | | | CTest: Fix '-T MemCheck' command-line support for sanitizersBrad King2020-04-171-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 49948f7221 (ctest_memcheck: Add support for ThreadSanitizer, 2014-07-07, v3.1.0-rc1~322^2~1) and commit 1e005eadbc (CTest: Fix MemoryCheckType from 'ctest -T MemCheck', 2014-07-15, v3.1.0-rc1~298^2), the `CMakeCommand` internal setting was left set only when using `ctest -S` scripts. Instead simply use CTest's corresponding CMake directly without passing it through an internal setting. Fixes: #20584
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-191-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'add-contains-to-cmext-algorithm'Marc Chevrier2020-04-1835-171/+149
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4606
| * | | | | | | | Refactoring: add cm::contains to <cmext/algorithm>Marc Chevrier2020-04-1735-171/+149
| | |/ / / / / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-181-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-04-171-1/+1
| | | | | | |
* | | | | | | Merge topic 'cat_cmd_20557'Kyle Edwards2020-04-161-0/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a625f30785 cmake -E: add cat command. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4600
| * | | | | | | cmake -E: add cat command.Johnny Jazeix2020-04-151-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concatenate files and print on the standard output. FIXES: #20557
* | | | | | | | Merge topic 'cuda_architectures'Brad King2020-04-166-1/+103
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21131ca60c CUDA: Add CudaOnly.CompileFlags test f0931b0790 CUDA: Convert tests to use CUDA_ARCHITECTURES e98588aaba CUDA: Add CUDA_ARCHITECTURES target property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Patrick Stotko <stotko@cs.uni-bonn.de> Merge-request: !4568
| * | | | | | | | CUDA: Add CUDA_ARCHITECTURES target propertyRaul Tambre2020-04-156-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies CUDA target architecture handling. Required for Clang support as Clang doesn't automatically select a supported architecture. We detect a supported architecture during compiler identification and set CMAKE_CUDA_ARCHITECTURES to it. Introduces CMP0104 for backwards compatibility with manually setting code generation flags with NVCC. Implements #17963.
* | | | | | | | | Merge topic 'makefile-target-special'Brad King2020-04-1614-63/+143
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4173ef165 Tests: Enable coverage of special chars in include dirs for Makefiles d74e651b78 Makefiles: Re-implement makefile target path escaping and quoting 031bfaa865 Makefiles: Factor out makefile target path escaping and quoting ca343dad07 Makefiles: Convert paths with '#' on command-lines to short path on Windows af7de05853 Makefiles: Do not use '\#' escape sequence with Windows-style make tools 1639ee70ef cmDepends: Update types to always use a Makefile generator 413d26030f cmGlobalNinjaGenerator: Remove outdated comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4605
| * | | | | | | | Makefiles: Re-implement makefile target path escaping and quotingBrad King2020-04-151-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used `cmSystemTools::ConvertToOutputPath` which internally used KWSys methods * SystemTools::ConvertToUnixOutputPath * SystemTools::ConvertToWindowsOutputPath These were written in very early days of CMake and have some limitations: * They do not encode all characters. E.g. '#' is left out. * They attempt to do some path cleanup and handle existing quotes. These days CMake has clean unquoted paths already. * They attempted to encode paths both for makefile targets and for shell command lines. The latter use has mostly been replaced. * Choosing between the two methods depends on a global variable! Several code paths in CMake have to copy the global generator's member ForceUnixPaths variable over to the cmSystemTools global. Re-implement the `ConvertToMakefilePath` method to drop use of those methods. Compute suitable makefile target path escaping and quoting via local logic. Add support for more characters like '#'. Fixes: #20555
| * | | | | | | | Makefiles: Factor out makefile target path escaping and quotingBrad King2020-04-155-41/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code paths that write makefile target paths use a combination of `cmSystemTools::ConvertToOutputPath` and `cmMakeSafe`. Some were missing the latter. Wrap these two steps up into a dedicated `ConvertToMakefilePath` method provided on both the local and global generators.
| * | | | | | | | Makefiles: Convert paths with '#' on command-lines to short path on WindowsBrad King2020-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `ConvertToOutputForExisting` we convert paths with spaces to short paths on Windows for use on command lines, e.g. for include directories. Do the same for paths with `#` since tools like NMake do not have a way to reliably put `#` in variable assignments.
generated by cgit v0.12 at 2025-02-11 05:26:16 (GMT)