Commit Graph

52305 Commits

Author SHA1 Message Date
Kitware Robot 0cf1b5c5ad CMake Nightly Date Stamp 2021-03-16 00:01:17 -04:00
Brad King 336c57edd0 Merge branch 'release-3.20' 2021-03-15 13:49:23 -04:00
Brad King acdbdad1d4 Merge topic 'ci-vs-16.8-in-16.9'
7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5910
2021-03-15 13:49:23 -04:00
Brad King dfdea7d9e3 Merge topic 'ci-vs-16.8-in-16.9' into release-3.20
7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5910
2021-03-15 13:49:23 -04:00
Brad King 7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9
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.
2021-03-15 12:19:00 -04:00
Brad King a5a4285f68 Merge branch 'release-3.20' 2021-03-15 12:07:02 -04:00
Brad King 06c6d01869 Merge branch 'release-3.19' into release-3.20 2021-03-15 12:06:30 -04:00
Brad King 08478c3ded Merge branch 'release-3.19' 2021-03-15 11:57:31 -04:00
Brad King 22612dd53a CMake 3.19.7 v3.19.7 2021-03-15 09:39:14 -04:00
Brad King 05d2a5175b Merge branch 'release-3.20' 2021-03-15 08:52:13 -04:00
Brad King 76b1b0b976 Merge branch 'release-3.19' into release-3.20 2021-03-15 08:52:09 -04:00
Brad King a38505bfa9 Merge branch 'release-3.19' 2021-03-15 08:51:53 -04:00
Brad King 1e2513b612 Merge topic 'vs-toolset-version' into release-3.20
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
2021-03-15 08:50:13 -04:00
Brad King 6716bee1db Merge branch 'release-3.20' 2021-03-15 08:50:13 -04:00
Brad King 3d661c6c3a Merge topic 'vs-toolset-version'
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
2021-03-15 08:50:13 -04:00
Brad King 0561664569 Merge topic 'cmake-print-properties-cache-fix'
bb9a701a2b CMakePrintHelpers: Work around CACHE argument of set()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5901
2021-03-15 08:49:26 -04:00
Kitware Robot 948b379e26 CMake Nightly Date Stamp 2021-03-15 00:01:19 -04:00
Kitware Robot d4053aabce CMake Nightly Date Stamp 2021-03-14 00:01:09 -05:00
Kitware Robot 982f7bb506 CMake Nightly Date Stamp 2021-03-13 00:01:18 -05:00
Brad King c141a8be9e Merge topic 'ci-build-no-doc' into release-3.20
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
2021-03-12 13:27:09 -05:00
Brad King e3009f16e9 Merge branch 'release-3.20' 2021-03-12 13:27:09 -05:00
Brad King aed12e10eb Merge topic 'ci-build-no-doc'
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
2021-03-12 13:27:09 -05:00
Brad King 9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs
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.
2021-03-12 13:05:55 -05:00
Brad King c540b611b8 Merge branch 'vs-toolset-version' into release-3.19
Merge-request: !5903
2021-03-12 09:26:25 -05:00
Brad King 30c835428f VS: Accept and translate '-T version=' values with three components
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
2021-03-12 08:36:45 -05:00
Brad King 58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9
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
2021-03-12 08:36:40 -05:00
Brad King 09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name 2021-03-12 06:33:51 -05:00
Kitware Robot 887e0c6c7b CMake Nightly Date Stamp 2021-03-12 00:01:17 -05:00
Brad King 871fc92929 Merge branch 'release-3.20' 2021-03-11 10:21:28 -05:00
Brad King c69d4b177f CMake 3.20.0-rc4 v3.20.0-rc4 2021-03-11 09:23:18 -05:00
Kyle Edwards bb9a701a2b CMakePrintHelpers: Work around CACHE argument of set()
Fixes: #21919
2021-03-11 08:55:05 -05:00
Brad King 2da1a8f92d Merge branch 'release-3.20' 2021-03-11 08:30:38 -05:00
Brad King 8b82b70292 Merge branch 'release-3.19' into release-3.20 2021-03-11 08:30:33 -05:00
Brad King 4c44d1b63d Merge branch 'release-3.19' 2021-03-11 08:30:25 -05:00
Brad King 9a80ce6d24 Merge topic 'add_prefix_cmake_option'
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
2021-03-11 08:16:03 -05:00
Brad King 0d7389c04e Merge topic 'cpack-source-dir-symlink-test'
f42b048b9c Tests: Check symlinks to directories in RunCMake.CPackSymlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5887
2021-03-11 08:14:19 -05:00
Brad King 00eb4df37e Merge topic 'file-COPY_FILE-subcommand'
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
2021-03-11 08:13:29 -05:00
Brad King 4606082742 Merge topic 'xcode-framework-quoting' into release-3.20
4f9a71974e Xcode: Restore support for spaces in framework names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5899
2021-03-11 08:10:42 -05:00
Brad King 6cb61bc576 Merge branch 'release-3.20' 2021-03-11 08:10:42 -05:00
Brad King e6695c7ad5 Merge topic 'xcode-framework-quoting'
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
2021-03-11 08:10:42 -05:00
Brad King fd64bf5738 Merge branch 'release-3.20' 2021-03-11 08:09:33 -05:00
Brad King 33900e3c7c Merge topic 'cray-compiler-wrapper-detection'
13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5897
2021-03-11 08:09:33 -05:00
Brad King f59a3e2148 Merge topic 'cray-compiler-wrapper-detection' into release-3.20
13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5897
2021-03-11 08:09:32 -05:00
Kitware Robot 8dacf533a9 CMake Nightly Date Stamp 2021-03-11 00:01:17 -05:00
Olivier Iffrig f42b048b9c Tests: Check symlinks to directories in RunCMake.CPackSymlinks
Regression test for issue #21886
2021-03-10 17:39:55 +00:00
Brad King acdbf64047 Merge branch 'cray-compiler-wrapper-detection' into release-3.19
Merge-request: !5897
2021-03-10 12:13:52 -05:00
Justin LaPolla 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms
Previously were checking for the `__CRAYXC` and `__CRAYXE` predefined
macros.  These macros reflect the platform that the compiler wrapper is
running on, i.e. Cray XC and Cray XE machines.  They are not defined on
other platforms such as Apollo80.

Switch to the `__CRAYXT_COMPUTE_LINUX_TARGET` macro. The Cray cc/CC/ftn
wrappers always define this macro on the command line. This macro has
been in use for many years, and is believed to be a reliable way to
detect current and older Cray compiler wrappers.

Fixes: #21904
2021-03-10 12:13:17 -05:00
Brad King ccfa0852c0 Merge topic 'ep-fc-revert-refactoring' into release-3.20
57d442e182 Revert ExternalProject and FetchContent refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5898
2021-03-10 11:37:15 -05:00
Brad King f29814c607 Merge branch 'release-3.20' 2021-03-10 11:37:15 -05:00
Brad King 03193a9e9a Merge topic 'ep-fc-revert-refactoring'
57d442e182 Revert ExternalProject and FetchContent refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5898
2021-03-10 11:37:15 -05:00