summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | CUDAToolkit: Add CUDA::cufft_static_nocallback targetRobert Maynard2022-01-122-0/+9
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #23098
* | | | | Merge topic 'cudatoolkit_correct_cublas_deps'Brad King2022-01-131-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | FindCUDAToolkit: depend cublas on cublasLt for CUDA 11.0+Robert Maynard2022-01-121-0/+7
| |/ / / /
* | | | | Merge topic 'ide_guide'Brad King2022-01-132-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a5936c596 Help: Add IDE Integration Guide section on IDEs supporting CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6851
| * | | | | Help: Add IDE Integration Guide section on IDEs supporting CMakeSemyon Kolton2022-01-122-0/+30
| | | | | |
* | | | | | Merge topic 'update-jsoncpp'Brad King2022-01-1313-148/+106
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | jsoncpp: Drop outdated CMake-specific READMEBrad King2022-01-121-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | jsoncpp: Drop deprecation markupBrad King2022-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit 0a0f71066f (jsoncpp: Drop deprecation markup, 2017-08-28, v3.10.0-rc1~199^2~3) to new markup instances.
| * | | | | | Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2022-01-1211-81/+105
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-jsoncpp: jsoncpp 2022-01-12 (42e892d9)
| | * | | | | | jsoncpp 2022-01-12 (42e892d9)JsonCpp Upstream2022-01-1211-81/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/open-source-parsers/jsoncpp.git at commit 42e892d96e47b1f6e29844cc705e148ec4856448 (42e892d96e47b1f6e29844cc705e148ec4856448).
| * | | | | | | jsoncpp: Update script to get jsoncpp 1.9.5Brad King2022-01-121-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Use a few commits past the 1.9.5 release to get the CHERI alignment fix.
* | | | | | | Merge branch 'release-3.22'Brad King2022-01-130-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'release-3.21' into release-3.22Brad King2022-01-130-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2022-01-130-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'vs2022-v143-link-guard-cf' into release-3.21Brad King2022-01-124-7/+48
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6858
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2022-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'vs2022-v143-link-guard-cf' into release-3.22Brad King2022-01-134-7/+48
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6858
* | | | | | | | | | Merge topic 'vs2022-v143-link-guard-cf'Brad King2022-01-134-7/+48
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6858
| * | | | | | | | VS: Remove the '/guard:cf' flag from v143 link flag tableBenjamin Sluis2022-01-124-7/+48
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | CMake Nightly Date StampKitware Robot2022-01-131-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'better_error_message_on_unsupported_language_level'Brad King2022-01-129-14/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | cmStandardLevelResolver: Better error message on unsupported language levelRobert Maynard2022-01-119-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23079
* | | | | | | | Merge branch 'release-3.22'Brad King2022-01-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'msvc-isystem' into release-3.22Brad King2022-01-122-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6855
* | \ \ \ \ \ \ \ Merge topic 'msvc-isystem'Brad King2022-01-122-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6855
| * | | | | | | | MSVC: Use -external:I flag without space to support Clang toolsBrad King2022-01-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'release-3.22'Brad King2022-01-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'file-READ_ELF-capture-error' into release-3.22Brad King2022-01-123-5/+29
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'file-READ_ELF-capture-error'Brad King2022-01-123-5/+29
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | file: Restore error capture in undocumented READ_ELF modeBrad King2022-01-113-5/+29
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge topic 'GoogleTest-discover-sq-brackets'Brad King2022-01-127-148/+226
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | GoogleTest: Add handling for square brackets in test namesEvgeniy Shcherbina2022-01-114-16/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | GoogleTest: Generalize test samplesEvgeniy Shcherbina2022-01-115-135/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced brittle (and irrelevant to the tests) parts of the sample outputs with generic regexps to ease making new test cases.
* | | | | | | | | Merge topic 'update-kwsys'Brad King2022-01-125-25/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | cmFileCommand: Update for new signature of GetLineFromStreamBrad King2022-01-111-6/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-01-114-19/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-01-11 (15b0b0c4)
| | * | | | | | | | | KWSys 2022-01-11 (15b0b0c4)KWSys Upstream2022-01-114-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge topic 'help-add_custom_command-DEPFILE-format'Brad King2022-01-121-3/+42
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a3aac990e Help: add_custom_command: describes depfile format Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6848
| * | | | | | | | | | | Help: add_custom_command: describes depfile formatMarc Chevrier2022-01-111-3/+42
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2022-01-121-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'FindLTTngUST-fix-version-detect'Brad King2022-01-111-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ce5765a86 FindLTTngUST: Fix version component extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6828
| * | | | | | | | | | FindLTTngUST: Fix version component extractionNorbert Lange2022-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Merge topic 'add_nvfortran_to_fortran_compiler_names'Brad King2022-01-111-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2be9d0f93 Fortran: Support searching for the `nvfortran` executable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6850
| * | | | | | | | | | Fortran: Support searching for the `nvfortran` executableRobert Maynard2022-01-101-2/+4
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on the PGI symlinks (pgf95/pgf90/...) to always exist.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2022-01-111-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'update-curl'Brad King2022-01-10102-2019/+3572
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | curl: Set build options the way we need for CMakeBrad King2022-01-072-16/+19
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2022-01-07101-2001/+3551
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2022-01-05 (801bd513)
| | * | | | | | | | | | curl 2022-01-05 (801bd513)Curl Upstream2022-01-07101-2000/+3551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 801bd5138ce31aa0d906fa4e2eabfc599d74e793 (curl-7_81_0).
| * | | | | | | | | | | curl: Update script to get curl 7.81.0Brad King2022-01-071-1/+1
| | | | | | | | | | | |
generated by cgit v0.12 at 2024-11-13 18:36:31 (GMT)