Commit Graph

52235 Commits

Author SHA1 Message Date
Brad King
95b46f1b91 Merge branch 'release-3.20' 2021-02-24 10:58:36 -05:00
Brad King
f456663101 Merge branch 'release-3.19' 2021-02-24 10:58:24 -05:00
Brad King
ee17a15148 Merge branch 'release-3.19' into release-3.20 2021-02-24 10:58:14 -05:00
Brad King
0ecd9de6dd CMake 3.19.6 v3.19.6 2021-02-24 10:08:43 -05:00
Raul Tambre
23753be1cc Clang/CUDA: Restore needed references to implicit link variables
In commit 4620cf77f2 (Clang: Remove unused CUDA implicit link variables,
2021-02-14) we removed some references.  It turns out they are non-empty
and necessary if using a non-scattered installation.

Fixes: #21863
2021-02-24 09:58:06 -05:00
Brad King
b4a103bdec Merge topic 'autouic-headers-ninja'
1265c65b33 AUTOUIC: Collect ui header files for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5803
2021-02-24 09:49:03 -05:00
Brad King
a70f8770f2 Merge topic 'better_cuda_compiler_detection_error_messages' into release-3.20
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5844
2021-02-24 09:47:39 -05:00
Brad King
956aa541c1 Merge branch 'release-3.20' 2021-02-24 09:47:39 -05:00
Brad King
35b448a7dd Merge topic 'better_cuda_compiler_detection_error_messages'
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5844
2021-02-24 09:47:39 -05:00
Brad King
31040d477c Merge branch 'release-3.20' 2021-02-24 09:46:53 -05:00
Brad King
e95f7aa0ed Merge topic 'preset-flag-consistency' into release-3.20
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument
3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument
2f13fdef0a cmake: Document '--preset <preset>' form of the argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5849
2021-02-24 09:46:52 -05:00
Brad King
414cfc6ecb Merge topic 'preset-flag-consistency'
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument
3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument
2f13fdef0a cmake: Document '--preset <preset>' form of the argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5849
2021-02-24 09:46:52 -05:00
Brad King
1c7b31e59e Merge branch 'release-3.20' 2021-02-24 09:45:51 -05:00
Brad King
d4ce3d65f3 Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property'
b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5841
2021-02-24 09:45:51 -05:00
Brad King
14c6a88db6 Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property' into release-3.20
b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5841
2021-02-24 09:45:50 -05:00
Brad King
022990c352 Merge branch 'release-3.20' 2021-02-24 09:44:59 -05:00
Brad King
261ba00668 Merge topic 'autogen-cmp0116-fix' into release-3.20
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN
cf34011ce7 Tests: Test per-CC behavior of CMP0116
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5848
2021-02-24 09:44:59 -05:00
Brad King
ab3485d15b Merge topic 'autogen-cmp0116-fix'
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN
cf34011ce7 Tests: Test per-CC behavior of CMP0116
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5848
2021-02-24 09:44:59 -05:00
Brad King
16a2c0cfa3 Merge branch 'release-3.20' 2021-02-24 09:42:49 -05:00
Brad King
09419af7af Merge branch 'release-3.19' 2021-02-24 09:42:46 -05:00
Brad King
9569b3f437 Merge branch 'release-3.19' into release-3.20 2021-02-24 09:42:39 -05:00
Brad King
0090df66d4 Merge branch 'release-3.20' 2021-02-24 09:42:00 -05:00
Brad King
75d7329adb Merge topic 'preset-no-comments' into release-3.20
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)"
431dd59b5e CMakePresets.json: Remove undocumented support for comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5853
2021-02-24 09:42:00 -05:00
Brad King
bf0fd71ad1 Merge topic 'preset-no-comments'
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)"
431dd59b5e CMakePresets.json: Remove undocumented support for comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5853
2021-02-24 09:42:00 -05:00
Brad King
cf21ea2ce6 Merge topic 'ninja-status-stderr' into release-3.20
d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5850
2021-02-24 09:41:03 -05:00
Brad King
4b27a80cbc Merge branch 'release-3.20' 2021-02-24 09:41:03 -05:00
Brad King
46607d561a Merge topic 'ninja-status-stderr'
d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5850
2021-02-24 09:41:03 -05:00
Brad King
fcf0c66b5a Merge branch 'backport-3.19-preset-no-comments' into release-3.19
Merge-request: !5853
2021-02-24 09:39:20 -05:00
Brad King
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments 2021-02-24 09:33:59 -05:00
Kyle Edwards
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 2021-02-24 09:33:50 -05:00
Kyle Edwards
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)"
Revert commit 8f1e607ed9 (Help: Document JSON comment support in
cmake-presets(7), 2021-02-18).  The support for comments was a mistake
when the feature was implemented in 3.19, and is being removed.
2021-02-24 09:33:50 -05:00
Kyle Edwards
431dd59b5e CMakePresets.json: Remove undocumented support for comments
Fixes: #21858
2021-02-24 09:28:36 -05:00
Kitware Robot
ca4a615118 CMake Nightly Date Stamp 2021-02-24 00:01:13 -05:00
Brad King
4339367e32 Merge branch 'release-3.20' 2021-02-23 13:00:46 -05:00
Brad King
8697701100 Merge topic 'ci-macos-arm64'
397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode
0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64
73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin
cab41b96ac ci: update to sccache 0.2.15 on linux builds
8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5851
2021-02-23 13:00:46 -05:00
Brad King
6714074cd4 Merge topic 'ci-macos-arm64' into release-3.20
397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode
0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64
73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin
cab41b96ac ci: update to sccache 0.2.15 on linux builds
8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5851
2021-02-23 13:00:45 -05:00
Brad King
397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode
For now, leave these jobs out during merge requests.
2021-02-23 11:21:59 -05:00
Brad King
0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64
This makes room for future equivalents for other architectures.
The packaging jobs produce universal binaries, so leave them as-is.
2021-02-23 11:21:59 -05:00
Brad King
73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin
Our custom build includes a patch to avoid server startup timeouts.
2021-02-23 11:21:11 -05:00
Brad King
289ab61fbe Merge branch 'ninja-status-stderr' into release-3.19
Merge-request: !5850
2021-02-23 11:01:14 -05:00
Brad King
d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr
Upstream ninja commit `ad3d29fb53` (Put builder output through status
interface) from ninja PR 1899 changed the status output from stdout to
stderr.  In particular, `ninja: no work to do` is now printed on stderr.
Update our RunCMake tests to accept this difference.

A few RunCMake test cases check for `ninja: no work to do`.  For those,
move the message to stdout using `RunCMake_TEST_OUTPUT_MERGE`.  The rest
of the test cases do not care about the message, so remove it from the
actual stderr content before comparing against that expected.
2021-02-23 10:55:12 -05:00
Brad King
cab41b96ac ci: update to sccache 0.2.15 on linux builds
The upstream release includes binaries for the architectures we need.
However, the binaries do not have execute permission in their tarballs,
so add it explicitly.
2021-02-23 09:33:28 -05:00
Brad King
8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs
It is a universal binary for both `x86_64` and `arm64` architectures.
2021-02-23 09:33:28 -05:00
Brad King
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument
The main `cmake --preset` argument for configure presets supports both
forms, so support it for `ctest --preset` too.

Fixes: #21855
2021-02-23 09:22:00 -05:00
Robert Maynard
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails 2021-02-23 09:21:42 -05:00
Kyle Edwards
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation 2021-02-23 09:17:12 -05:00
Kyle Edwards
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN 2021-02-23 09:17:12 -05:00
Kyle Edwards
cf34011ce7 Tests: Test per-CC behavior of CMP0116 2021-02-23 09:17:12 -05:00
Kyle Edwards
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation 2021-02-23 09:14:31 -05:00
Kyle Edwards
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation 2021-02-23 09:14:31 -05:00