Commit Graph

55820 Commits

Author SHA1 Message Date
Craig Scott d2efc90598 Help: Move linker preference variables to the internal section
These probably should not have been documented as public variables
to begin with. But since they have been documented for a long time,
we can't just remove them from the docs. Move them to the internal
section instead to make it clearer that they are not intended to be used
directly by projects.
2022-01-15 11:09:19 +11:00
Kitware Robot 4da4e31db2 CMake Nightly Date Stamp 2022-01-14 00:02:14 -05:00
Brad King a20d9e1463 Merge topic 'cudatoolkit_find_cufft_static_nocallback'
a4126d1c01 CUDAToolkit: Add CUDA::cufft_static_nocallback target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6856
2022-01-13 15:24:39 -05:00
Brad King 874ae8045a Merge topic 'cudatoolkit_correct_cublas_deps'
9e6c26b75c FindCUDAToolkit: depend cublas on cublasLt for CUDA 11.0+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6857
2022-01-13 15:23:58 -05:00
Brad King 6baf3b27c9 Merge topic 'ide_guide'
6a5936c596 Help: Add IDE Integration Guide section on IDEs supporting CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6851
2022-01-13 15:23:04 -05:00
Brad King 2f7444949c Merge topic 'update-jsoncpp'
62a8e16fc1 jsoncpp: Drop outdated CMake-specific README
b3cb1c6cc3 jsoncpp: Drop deprecation markup
33fae4cd7a Merge branch 'upstream-jsoncpp' into update-jsoncpp
7a72ab3388 jsoncpp 2022-01-12 (42e892d9)
eb031dfe9f jsoncpp: Update script to get jsoncpp 1.9.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6859
2022-01-13 15:22:05 -05:00
Brad King 38d6733608 Merge branch 'release-3.22' 2022-01-13 15:20:56 -05:00
Brad King d79c40b1d5 Merge branch 'release-3.21' into release-3.22 2022-01-13 15:20:44 -05:00
Brad King cd970c5faf Merge branch 'release-3.21' 2022-01-13 15:19:37 -05:00
Brad King e5eaf4ef38 Merge branch 'release-3.22' 2022-01-13 15:18:49 -05:00
Brad King 67cb256cfe Merge topic 'vs2022-v143-link-guard-cf'
9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6858
2022-01-13 15:18:49 -05:00
Brad King f47ffab9c8 Merge topic 'vs2022-v143-link-guard-cf' into release-3.22
9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6858
2022-01-13 15:18:48 -05:00
Kitware Robot 50cfe54402 CMake Nightly Date Stamp 2022-01-13 00:03:28 -05:00
Brad King 62a8e16fc1 jsoncpp: Drop outdated CMake-specific README
Since commit ee68d3eb8c (jsoncpp: Add script to update from upstream,
2017-08-28, v3.10.0-rc1~199^2~8) we use a script to maintain the jsoncpp
vendor branch.  Drop our readme that documented the old approach.
2022-01-12 17:46:02 -05:00
Brad King b3cb1c6cc3 jsoncpp: Drop deprecation markup
Apply the change from commit 0a0f71066f (jsoncpp: Drop deprecation
markup, 2017-08-28, v3.10.0-rc1~199^2~3) to new markup instances.
2022-01-12 17:42:14 -05:00
Brad King 33fae4cd7a Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
  jsoncpp 2022-01-12 (42e892d9)
2022-01-12 17:05:54 -05:00
JsonCpp Upstream 7a72ab3388 jsoncpp 2022-01-12 (42e892d9)
Code extracted from:

    https://github.com/open-source-parsers/jsoncpp.git

at commit 42e892d96e47b1f6e29844cc705e148ec4856448 (42e892d96e47b1f6e29844cc705e148ec4856448).
2022-01-12 17:04:04 -05:00
Brad King eb031dfe9f jsoncpp: Update script to get jsoncpp 1.9.5
Use a few commits past the 1.9.5 release to get the CHERI alignment fix.
2022-01-12 17:03:05 -05:00
Brad King 88198e65f6 Merge branch 'vs2022-v143-link-guard-cf' into release-3.21
Merge-request: !6858
2022-01-12 16:53:51 -05:00
Benjamin Sluis 9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table
Apply the change from commit db35e3cfd6 (VS: Fix support for '/guard:cf'
linker flag for v142, 2019-01-24, v3.14.0-rc1~74^2~2) to the v143 flag
table.

The entry for `LinkControlFlowGuard` in `v143_Link.json` does not work
when used in a `.vcxproj` file.  Drop our link flag table entries for
this toolset so that the flag will be passed via `AdditionalOptions`.

Also add a test case.
2022-01-12 16:45:07 -05:00
Robert Maynard a4126d1c01 CUDAToolkit: Add CUDA::cufft_static_nocallback target
Fixes: #23098
2022-01-12 16:04:02 -05:00
Semyon Kolton 6a5936c596 Help: Add IDE Integration Guide section on IDEs supporting CMake 2022-01-12 15:48:39 -05:00
Robert Maynard 9e6c26b75c FindCUDAToolkit: depend cublas on cublasLt for CUDA 11.0+ 2022-01-12 15:06:49 -05:00
Brad King 0c038689be Merge topic 'better_error_message_on_unsupported_language_level'
ec1e40af1a cmStandardLevelResolver: Better error message on unsupported language level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6854
2022-01-12 09:57:23 -05:00
Brad King a97cc1ca2d Merge branch 'release-3.22' 2022-01-12 09:51:32 -05:00
Brad King c0f0fe50bf Merge topic 'msvc-isystem'
3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6855
2022-01-12 09:51:32 -05:00
Brad King 67442ca471 Merge topic 'msvc-isystem' into release-3.22
3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6855
2022-01-12 09:51:31 -05:00
Brad King 809206e1a6 Merge branch 'release-3.22' 2022-01-12 09:45:07 -05:00
Brad King d009622769 Merge topic 'file-READ_ELF-capture-error'
41bebbe50a file: Restore error capture in undocumented READ_ELF mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6853
2022-01-12 09:45:07 -05:00
Brad King eb4e99563c Merge topic 'file-READ_ELF-capture-error' into release-3.22
41bebbe50a file: Restore error capture in undocumented READ_ELF mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6853
2022-01-12 09:45:06 -05:00
Brad King c7af954770 Merge topic 'GoogleTest-discover-sq-brackets'
8b85b10fb3 GoogleTest: Add handling for square brackets in test names
8f977a5c92 GoogleTest: Generalize test samples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6842
2022-01-12 09:44:24 -05:00
Brad King 34d16d9e56 Merge topic 'update-kwsys'
0d37dae5f9 cmFileCommand: Update for new signature of GetLineFromStream
f52dac56a0 Merge branch 'upstream-KWSys' into update-kwsys
6e8a2de4cb KWSys 2022-01-11 (15b0b0c4)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6852
2022-01-12 09:43:09 -05:00
Brad King e804e3ef59 Merge topic 'help-add_custom_command-DEPFILE-format'
8a3aac990e Help: add_custom_command: describes depfile format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6848
2022-01-12 09:42:21 -05:00
Kitware Robot fdf5d0a04b CMake Nightly Date Stamp 2022-01-12 00:01:19 -05:00
Brad King 3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools
Since commit f29e1874ad (Compiler/MSVC: use the `-external:I` flag for
system includes, 2020-05-19, v3.22.0-rc1~593^2) we use the new flag
followed by the include directory as a separate argument.  Some versions
of `clang-cl` and `clang-tidy` do not support the flag unless the
include directory is attached to it, so use that form instead.

Fixes: #22979
2022-01-11 16:36:36 -05:00
Robert Maynard ec1e40af1a cmStandardLevelResolver: Better error message on unsupported language level
Fixes #23079
2022-01-11 16:03:57 -05:00
Brad King 41bebbe50a file: Restore error capture in undocumented READ_ELF mode
Revise the error message added by commit 115ff6a347 (cmELF: Include the
ELF parsing code unconditionally, 2021-06-17, v3.22.0-rc1~557^2) to
honor the `CAPTURE_ERROR` option.  This is needed by the call site in
`BundleUtilities` to suppress errors on non-ELF files.

Fixes: #23074
2022-01-11 12:46:06 -05:00
Brad King 0d37dae5f9 cmFileCommand: Update for new signature of GetLineFromStream 2022-01-11 11:09:53 -05:00
Brad King f52dac56a0 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-01-11 (15b0b0c4)
2022-01-11 10:57:44 -05:00
KWSys Upstream 6e8a2de4cb KWSys 2022-01-11 (15b0b0c4)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 15b0b0c45e87c7f5bdc24ece6912c1a7dd9ef9f4 (master).

Upstream Shortlog
-----------------

Alexey Edelev (1):
      549d3d0b SystemTools: Fix type of GetLineFromStream

Jessica Clarke (1):
      ebfb5cdb SystemInformation: Change GetRealAddress to return a size_t
2022-01-11 10:57:44 -05:00
Brad King ddc6be2c19 Merge topic 'FindLTTngUST-fix-version-detect'
4ce5765a86 FindLTTngUST: Fix version component extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6828
2022-01-11 08:04:33 -05:00
Brad King a3a6062081 Merge topic 'add_nvfortran_to_fortran_compiler_names'
d2be9d0f93 Fortran: Support searching for the `nvfortran` executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6850
2022-01-11 08:03:19 -05:00
Marc Chevrier 8a3aac990e Help: add_custom_command: describes depfile format 2022-01-11 12:51:11 +01:00
Evgeniy Shcherbina 8b85b10fb3 GoogleTest: Add handling for square brackets in test names
If a test name contains a square bracket (due to parameters) then it
breaks gtest_discovery_test() function in some not-so-predictable
way. That happens due to the special meaning these brackets have in
the CMake language and they can't be escaped universally.

So the following treatment has been implemented:

* Every occurrence of ('[' | ']') in a test name gets replaced with
the corresponding placeholder ("__osb_*" | "__csb_*") before the
Google Test output processing and gets replaced back before adding
a new test to CTest, keeping the original test name intact in the
CTest output.

The placeholders are chosen that way to minimize the chance of
clashing with something in the user tests but even if the default
ones would clash with something then they are enhanced to not clash
with anything (hence "_*" at the placeholder's end).

* The GTest output gets searched for the default test name guards
("[=[" | "]=]") and if they are found a new one gets generated until
the one is found which can safely encompass any test name. The
search is quite simple: find the least amount of '=' which would
allow escaping any test.

* The resulting ${TEST_LIST} variable will contain every test but
tests with square brackets as there is no way to make sure such
tests won't break the list altogether.

Fixes: #23039
2022-01-11 09:00:53 +03:00
Evgeniy Shcherbina 8f977a5c92 GoogleTest: Generalize test samples
Replaced brittle (and irrelevant to the tests) parts of the sample
outputs with generic regexps to ease making new test cases.
2022-01-11 09:00:52 +03:00
Kitware Robot e968467354 CMake Nightly Date Stamp 2022-01-11 00:01:11 -05:00
Norbert Lange 4ce5765a86 FindLTTngUST: Fix version component extraction
The regex was greedy and slurped away all but the last digit,
so 2.13.1 was for ex. detected as 2.3.1.
Fix this by expecting preceding whitespace.
2022-01-10 17:56:48 -05:00
Brad King 5dd655d5e7 Merge topic 'update-curl'
9341e63233 curl: Set build options the way we need for CMake
697e8871a1 Merge branch 'upstream-curl' into update-curl
a1f6ec647c curl 2022-01-05 (801bd513)
bdb3a8203e curl: Update script to get curl 7.81.0
e9260cf4b0 Merge branch 'upstream-curl' into update-curl
a4ad12d843 curl 2021-09-22 (c7aef0a9)
520809b5ae curl: Update script for new curl mailing list address

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6845
2022-01-10 17:12:38 -05:00
Brad King 39eabc17c4 Merge topic 'cmake-presets-include'
26a5512c0f CMakePresets: Add include field
a239f23a98 Refactor: Generalize file graph in CMakePresets
84d440caac Refactor: Split JSON processing into configure, build, and test presets
fd6ea2f67f Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraph

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6829
2022-01-10 17:12:03 -05:00
Brad King b9a40fd7ba Merge topic 'cmake-ide-preset-command-line-length'
94de63effa Guide: Recommend -C for IDE presets instead of -D

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Bob Brown <bobbrow@microsoft.com>
Merge-request: !6846
2022-01-10 17:11:13 -05:00