mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 22:50:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,800 Commits 2 Branches 391 Tags
33fae4cd7a344889404ce61fe1d40a443ad58def
Commit Graph

55800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Robert Maynard
d2be9d0f93 Fortran: Support searching for the nvfortran executable 
Instead of relying on the PGI symlinks (pgf95/pgf90/...) to always exist.
 2022-01-10 09:48:25 -05:00
Kitware Robot
1e839298b0 CMake Nightly Date Stamp 2022-01-10 00:01:48 -05:00
Craig Scott
055d574084 Merge topic 'ExternalProject-IS_NEWER_THAN' 
d73fc5dd2a ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6847
 2022-01-09 19:47:07 -05:00
Kitware Robot
290a0da3d7 CMake Nightly Date Stamp 2022-01-09 00:01:06 -05:00
Craig Scott
d73fc5dd2a ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks 
This change was originally made in 404cddb7bb (ExternalProject:
Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21),
but was reverted by 57d442e182 (Revert ExternalProject and
FetchContent refactoring, 2021-03-10) due to regressions from
other changes. Reapply this fix on its own, since it is still valid.

When using a file system which only has second resolution timestamps,
there is a reasonably high likelihood of timestamps being the same.
The IS_NEWER_THAN test returns true when timestamps are the same,
so don't redo downloads when they match exactly.
 2022-01-08 20:51:44 +11:00
Kitware Robot
3279cec012 CMake Nightly Date Stamp 2022-01-08 00:01:14 -05:00
Kyle Edwards
94de63effa Guide: Recommend -C for IDE presets instead of -D 
Issue: #23083
 2022-01-07 12:43:53 -05:00
Brad King
9341e63233 curl: Set build options the way we need for CMake 2022-01-07 11:42:30 -05:00
Brad King
697e8871a1 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-01-05 (801bd513)
 2022-01-07 11:41:57 -05:00
Curl Upstream
a1f6ec647c curl 2022-01-05 (801bd513) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 801bd5138ce31aa0d906fa4e2eabfc599d74e793 (curl-7_81_0).
 2022-01-07 11:41:33 -05:00
Brad King
bdb3a8203e curl: Update script to get curl 7.81.0 2022-01-07 11:41:24 -05:00
Brad King
e9260cf4b0 Merge branch 'upstream-curl' into update-curl 2022-01-07 11:40:52 -05:00
Curl Upstream
a4ad12d843 curl 2021-09-22 (c7aef0a9) 
Code extracted from:

    https://github.com/curl/curl.git

at commit c7aef0a945f9b6fb6d3f91716a21dfe2f4ea635f (curl-7_79_1).
 2022-01-07 11:38:53 -05:00
Brad King
520809b5ae curl: Update script for new curl mailing list address 2022-01-07 11:38:15 -05:00
Brad King
b996e576c2 Merge topic 'GoogleTest-dots' 
1f9554d4e9 GoogleTest: Fix regex matching all dots in the suite name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6822
 2022-01-07 10:23:54 -05:00
Brad King
7b1099a52f Merge topic 'cmcldeps-cross' 
d49e168e1b Ninja: Do not use cmcldeps for RC on non-Windows hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dmitry Mikushin <dmitry@kernelgen.org>
Merge-request: !6843
 2022-01-07 09:43:39 -05:00
Brad King
efe3410cbb Merge topic 'msvc-arm64ec' 
26f52508f2 MSVC: update arm64ec default flags and lib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6841
 2022-01-07 09:42:53 -05:00
Brad King
155434f344 Merge topic 'nghttp2-fix-ssize_t-dep' 
99acfe41f5 cmnghttp2: check for HAVE_SIZEOF_SSIZE_T and not HAVE_SSIZE_T

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6831
 2022-01-07 09:41:53 -05:00
Brad King
ec02e94119 Merge branch 'release-3.22' 2022-01-07 09:40:15 -05:00
Brad King
46b34407cb Merge topic 'armasm-6.17' 
c2777ed008 ASM: Fix identification of armasm 6.17+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6833
 2022-01-07 09:40:15 -05:00