summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ci-vs-16.8-in-16.9'Brad King2021-03-152-4/+4
|\ | | | | | | | | | | | | 7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5910
| * gitlab-ci: Fix using VS 16.8 toolset under VS 16.9Brad King2021-03-152-4/+4
| | | | | | | | | | | | The 16.8 and 16.9 toolset numbers vary only in their third component. Use CMake 3.19.7 for three-component toolset version specification support.
* | Merge branch 'release-3.20'Brad King2021-03-150-0/+0
|\ \ | |/
| * Merge branch 'release-3.19' into release-3.20Brad King2021-03-150-0/+0
| |\
* | \ Merge branch 'release-3.19'Brad King2021-03-150-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.19.7v3.19.7Brad King2021-03-151-1/+1
| | |
* | | Merge branch 'release-3.20'Brad King2021-03-150-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.19' into release-3.20Brad King2021-03-150-0/+0
| |\ \ | | |/
* | | Merge branch 'release-3.19'Brad King2021-03-150-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'vs-toolset-version' into release-3.19Brad King2021-03-127-96/+170
| |\ \ | | | | | | | | | | | | Merge-request: !5903
* | \ \ Merge branch 'release-3.20'Brad King2021-03-150-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'vs-toolset-version' into release-3.20Brad King2021-03-157-96/+170
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 30c835428f VS: Accept and translate '-T version=' values with three components 58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9 09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5903
* | | | Merge topic 'vs-toolset-version'Brad King2021-03-157-96/+170
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 30c835428f VS: Accept and translate '-T version=' values with three components 58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9 09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5903
| * | | VS: Accept and translate '-T version=' values with three componentsBrad King2021-03-123-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS 16.8 and VS 16.9 toolset versions differ only in their third component. The `vcvarsall` option `-vcvars_ver=` accepts a three component version, so accept this format for VS toolset selection too. Issue: #21922
| * | | VS: Fix '-T version=14.28' under VS 16.9Brad King2021-03-126-91/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake accepts the toolset version that is default in the current VS version by matching the name later VS versions will use for the SxS props files. It predicts the future name based on the first two components of the current VS version's default toolset. However, this heuristic breaks naming the VS 16.8 toolset version 14.28 under VS 16.9 because the latter's default toolset version is 14.28.29910, which did not increment the second version component (unprecedented in VS). Fix this by always using the requested version's SxS props file when it exists, even if it matches the first two components of the current VS version's default toolset. Also add a special case for the name VS 16.10 will use for VS 16.9's default toolset, so that it can be used with VS 16.9 too. Fixes: #21922
| * | | cmGlobalVisualStudioVersionedGenerator: Clarify local variable nameBrad King2021-03-121-5/+5
| | |/ | |/|
* | | Merge topic 'cmake-print-properties-cache-fix'Brad King2021-03-151-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bb9a701a2b CMakePrintHelpers: Work around CACHE argument of set() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5901
| * | | CMakePrintHelpers: Work around CACHE argument of set()Kyle Edwards2021-03-111-1/+4
| | | | | | | | | | | | | | | | Fixes: #21919
* | | | CMake Nightly Date StampKitware Robot2021-03-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-03-141-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-03-131-1/+1
| | | |
* | | | Merge branch 'release-3.20'Brad King2021-03-120-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'ci-build-no-doc' into release-3.20Brad King2021-03-121-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5905
* | \ \ \ Merge topic 'ci-build-no-doc'Brad King2021-03-121-1/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5905
| * | | | gitlab-ci: remove redundant sphinx build from release-style CI jobsBrad King2021-03-121-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | The Sphinx build is mostly serial and takes a long time. All our CI pipelines (packaging, integration branches, merge requests) have a dedicated job for the Sphinx build.
* | | | CMake Nightly Date StampKitware Robot2021-03-121-1/+1
| | | |
* | | | Merge branch 'release-3.20'Brad King2021-03-110-0/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | CMake 3.20.0-rc4v3.20.0-rc4Brad King2021-03-111-1/+1
| | |
* | | Merge branch 'release-3.20'Brad King2021-03-110-0/+0
|\ \ \ | |/ /
| * | Merge branch 'release-3.19' into release-3.20Brad King2021-03-110-0/+0
| |\ \ | | |/
* | | Merge branch 'release-3.19'Brad King2021-03-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'cray-compiler-wrapper-detection' into release-3.19Brad King2021-03-103-5/+5
| |\ \ | | | | | | | | | | | | Merge-request: !5897
| * \ \ Merge branch 'backport-xcode-framework-quoting' into release-3.19Brad King2021-03-104-1/+26
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5899
* | \ \ \ Merge topic 'add_prefix_cmake_option'Brad King2021-03-1124-10/+253
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 400536c317 cmCommandLineArgument: trim leading empty spaces b227a9565e cmake: configure preset add support for --install-prefix mapping 38140713ad cmake: add support for --install-prefix command argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5843
| * | | | | cmCommandLineArgument: trim leading empty spacesRobert Maynard2021-03-091-0/+4
| | | | | |
| * | | | | cmake: configure preset add support for --install-prefix mappingRobert Maynard2021-03-0919-9/+212
| | | | | |
| * | | | | cmake: add support for --install-prefix command argumentRobert Maynard2021-03-048-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21781
* | | | | | Merge topic 'cpack-source-dir-symlink-test'Brad King2021-03-114-4/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f42b048b9c Tests: Check symlinks to directories in RunCMake.CPackSymlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5887
| * | | | | | Tests: Check symlinks to directories in RunCMake.CPackSymlinksOlivier Iffrig2021-03-104-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression test for issue #21886
* | | | | | | Merge topic 'file-COPY_FILE-subcommand'Brad King2021-03-1135-0/+334
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 088444211e file: add `COPY_FILE` subcommand 100016e9cb cmSystemTools: add utilities to copy a file with error handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5885
| * | | | | | | file: add `COPY_FILE` subcommandBen Boeckel2021-03-1033-0/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `file(COPY)` subcommand is overloaded and busy for such a simple operation. Instead, make a simpler subcommand with error handling support.
| * | | | | | | cmSystemTools: add utilities to copy a file with error handlingBen Boeckel2021-03-092-0/+64
| | | | | | | |
* | | | | | | | Merge branch 'release-3.20'Brad King2021-03-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge topic 'xcode-framework-quoting' into release-3.20Brad King2021-03-114-1/+26
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f9a71974e Xcode: Restore support for spaces in framework names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5899
* | | | | | | | Merge topic 'xcode-framework-quoting'Brad King2021-03-115-1/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00ecddd9eb Tests: Enable Framework test case with spaces everywhere possible b6cc9be009 Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quoting 4f9a71974e Xcode: Restore support for spaces in framework names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5899
| * | | | | | | | Tests: Enable Framework test case with spaces everywhere possibleBrad King2021-03-102-1/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quotingBrad King2021-03-104-1/+26
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Xcode: Restore support for spaces in framework namesBrad King2021-03-104-1/+26
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ce2dee9e5b (Xcode: Don't add framework as -framework argument in linker info list, 2020-09-28, v3.19.0-rc1~47^2) we split up the path to a framework into the directory and framework name parts, but only retained the quoting on the directory part. Restore quoting of the framework name. Fixes: #21910
* | | | | | | | Merge branch 'release-3.20'Brad King2021-03-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cray-compiler-wrapper-detection' into release-3.20Brad King2021-03-113-5/+5
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5897
generated by cgit v0.12 at 2025-02-22 13:35:57 (GMT)