Commit Graph

55850 Commits

Author SHA1 Message Date
Marc Chevrier
219dde4ea8 CheckPIESupported: now uses any SYSROOT settings
Fixes: 23053
2022-01-19 10:49:23 +01:00
Marc Chevrier
4fa105d34e Check{Compiler,Linker}Flag: Add possibility to retrieve check outputs 2022-01-19 10:49:23 +01:00
Kitware Robot
58804d1e58 CMake Nightly Date Stamp 2022-01-19 00:02:16 -05:00
Brad King
a2e42a577b Merge topic 'cuda_host_env'
70f5d9eb49 CUDA: Fix CMAKE_CUDA_COMPILER_ARG1 cache description
ad6cd1074b Help: Correct CUDAHOSTCXX and CUDAARCHS as having higher precedence

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6872
2022-01-18 12:12:09 -05:00
Brad King
d77a039cd4 Merge topic 'doc-internal-linker-preference'
d2efc90598 Help: Move linker preference variables to the internal section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6871
2022-01-18 12:09:59 -05:00
Brad King
0604c79c07 Merge topic 'CheckLinkerFlag-update-implementation'
9d1b9a4aa1 CheckLinkerFlag: rely now on internal implementation
660e0d80ae internal/CheckCompilerFlag: rely on common configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6860
2022-01-18 12:08:58 -05:00
Brad King
8ffa7b7957 Merge topic 'find_library-clean-env'
b916860a48 Tests: Avoid interference from environment in RunCMake.find_library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6868
2022-01-18 12:06:23 -05:00
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
Raul Tambre
70f5d9eb49 CUDA: Fix CMAKE_CUDA_COMPILER_ARG1 cache description
Also corrected the misleading indentation.
2022-01-15 21:55:06 +02:00
Raul Tambre
ad6cd1074b Help: Correct CUDAHOSTCXX and CUDAARCHS as having higher precedence
For CUDAHOSTCXX the behaviour seems to have been like this since the
introduction of it in commit 9cf5b98d ("CUDA: Prefer environment variables
CUDACXX and CUDAHOSTCXX.", 2016-11-08) and is likely unintentional judging by
the wording of the commit.

The documentation mistake seems to be a copy-paste error from when all the
environment variables were documented in commit e6b77c5f ("Help: Document
CMake's environment variables", 2017-09-01).
Describe this explicitly as it is unlike all other similar environment
variables.

For CUDAARCHS we got it wrong from the get-go in commit c4ae9384 ("CUDA:
Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS}", 2020-11-24).

Correcting either to follow the more standard precedence behaviour will require
a policy.

Fixes #23081.
2022-01-15 21:51:21 +02:00
Kitware Robot
d9a8744c50 CMake Nightly Date Stamp 2022-01-15 00:02:21 -05:00
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
Craig Scott
acd65d78c4 Help: Actual language standard can be higher than <LANG>_STANDARD
Fixes: #22885
2022-01-15 10:51:07 +11:00
Marc Chevrier
9d1b9a4aa1 CheckLinkerFlag: rely now on internal implementation
This internal implementation share the configuration
with CheckCompilerFlag.
2022-01-14 23:22:07 +01:00
Marc Chevrier
660e0d80ae internal/CheckCompilerFlag: rely on common configuration
Extract configuration step from the CheckCompilerFlag command
to enable to share it with future CheckLinkerFlag implementation
2022-01-14 23:22:01 +01: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
b916860a48 Tests: Avoid interference from environment in RunCMake.find_library
Clear $ENV{CMAKE_PREFIX_PATH} in several RunCMake.find_library tests
because on Windows, a CMAKE_PREFIX_PATH with two consecutive
semicolons causes a library to be found when it should not be.

None of the updated tests expect CMAKE_PREFIX_PATH from the environment
to influence the test, so clear the variable entirely to guarantee it
will not affect the test.

Fixes: #23111
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
2022-01-14 13:15:09 -05: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