mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 04:02:03 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,837 Commits 2 Branches 390 Tags
807e0bb95c8cc9eb908907542869c6ce2ea2a561
Commit Graph

55837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
807e0bb95c Merge topic 'add-intel-copyright' 
34fcc6b586 Add Intel to the Copyright.txt file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6869
 2022-01-18 12:04:52 -05:00
Brad King
869349c710 Merge topic 'IntelLLVM-windows-link-with-driver' 
79921fb00c IntelLLVM: Set linker to compiler driver for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6866
 2022-01-18 12:04:02 -05:00
Kitware Robot
bdee63eef2 CMake Nightly Date Stamp 2022-01-18 00:01:08 -05:00
Kitware Robot
bb46b19597 CMake Nightly Date Stamp 2022-01-17 00:02:56 -05:00
Kitware Robot
856fbe62f3 CMake Nightly Date Stamp 2022-01-16 00:02:13 -05:00
Craig Scott
b748878880 Merge topic 'doc-LANG_STANDARD_REQUIRED' 
acd65d78c4 Help: Actual language standard can be higher than <LANG>_STANDARD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6870
 2022-01-15 15:45:08 -05:00
Kitware Robot
d9a8744c50 CMake Nightly Date Stamp 2022-01-15 00:02:21 -05:00
Craig Scott
acd65d78c4 Help: Actual language standard can be higher than <LANG>_STANDARD 
Fixes: #22885
 2022-01-15 10:51:07 +11:00
William R. Dieter
34fcc6b586 Add Intel to the Copyright.txt file 
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
 2022-01-14 10:25:18 -08:00
William R. Dieter
79921fb00c IntelLLVM: Set linker to compiler driver for Windows 
For IntelLLVM, linking with the compiler driver is preferred over using
the linker directly.  This is especially true when doing offload to a
target accelerator, which can produce object files that the regular
linker will not handle properly.

Windows-IntelLLVM relies on Windows-MSVC.cmake for many definitions.
This commit does not change that, but does override the MSVC defaults
for linking executables, shared libraries, and static libraries so that
CMake will use the compiler driver instead of the linker.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
 2022-01-14 08:57:03 -05:00
Brad King
a0e78cc30c Merge topic 'fix_file_offset' 
fd0c285b12 file: Fix types of the OFFSET and LIMIT arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6839
 2022-01-14 08:46:07 -05:00
Brad King
84a910d86d Merge topic 'doc-DEPRECATION-format' 
e9b237b6d7 Help: Document formatting of DEPRECATION target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6864
 2022-01-14 08:45:23 -05:00
Brad King
e5aadd5877 Merge topic 'update-libuv' 
fc4a11a036 libuv: add cast to pass sockaddr_storage as sockaddr on windows
ea70fb3905 Merge branch 'upstream-libuv' into update-libuv
09ec116d91 libuv 2022-01-13 (2fbfa035)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6863
 2022-01-14 08:44:27 -05:00
Kitware Robot
4da4e31db2 CMake Nightly Date Stamp 2022-01-14 00:02:14 -05:00
Brad King
fc4a11a036 libuv: add cast to pass sockaddr_storage as sockaddr on windows 
Tell the compiler the structs are layout-compatible.
 2022-01-13 16:41:35 -05:00
Brad King
e9b237b6d7 Help: Document formatting of DEPRECATION target property 
Also add a test case to verify it.
 2022-01-13 15:56:54 -05:00
Brad King
ea70fb3905 Merge branch 'upstream-libuv' into update-libuv 
# By libuv upstream
* upstream-libuv:
  libuv 2022-01-13 (2fbfa035)
 2022-01-13 15:46:20 -05:00
libuv upstream
09ec116d91 libuv 2022-01-13 (2fbfa035) 
Code extracted from:

    https://github.com/libuv/libuv.git

at commit 2fbfa0358b3bb920ddd1c2747d4887b35b9ac161 (v1.x).
 2022-01-13 15:46:19 -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
Alexey Edelev
fd0c285b12 file: Fix types of the OFFSET and LIMIT arguments 
OFFSET argument cannot handle offsets bigger than INT_MAX because of
the atoi function, which is used to convert the argument string to integer.
Same applies for the LIMIT argument.
Use the steam based reading and 64-bit types to convert and store arguments
to avoid invalid values stored in the corresponding variables.

Fixes: #23076
 2022-01-13 11:56:49 +01: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