summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-expat' into update-expatBrad King2022-01-187-19/+214
|\ | | | | | | | | * upstream-expat: expat 2022-01-16 (57c7da69)
| * expat 2022-01-16 (57c7da69)Expat Upstream2022-01-187-19/+216
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit 57c7da69b78e3698e112a6b5da19d5109b8232d1 (R_2_4_3).
* | expat: Update script to get Expat 2.4.3Brad King2022-01-181-1/+1
| |
* | Merge topic 'cuda_host_env'Brad King2022-01-183-14/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | CUDA: Fix CMAKE_CUDA_COMPILER_ARG1 cache descriptionRaul Tambre2022-01-151-9/+9
| | | | | | | | | | | | Also corrected the misleading indentation.
| * | Help: Correct CUDAHOSTCXX and CUDAARCHS as having higher precedenceRaul Tambre2022-01-152-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'doc-internal-linker-preference'Brad King2022-01-183-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d2efc90598 Help: Move linker preference variables to the internal section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6871
| * | | Help: Move linker preference variables to the internal sectionCraig Scott2022-01-153-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'CheckLinkerFlag-update-implementation'Brad King2022-01-186-113/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d1b9a4aa1 CheckLinkerFlag: rely now on internal implementation 660e0d80ae internal/CheckCompilerFlag: rely on common configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6860
| * | | | CheckLinkerFlag: rely now on internal implementationMarc Chevrier2022-01-142-47/+37
| | | | | | | | | | | | | | | | | | | | | | | | | This internal implementation share the configuration with CheckCompilerFlag.
| * | | | internal/CheckCompilerFlag: rely on common configurationMarc Chevrier2022-01-144-66/+81
| | | | | | | | | | | | | | | | | | | | | | | | | Extract configuration step from the CheckCompilerFlag command to enable to share it with future CheckLinkerFlag implementation
* | | | | Merge topic 'find_library-clean-env'Brad King2022-01-183-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tests: Avoid interference from environment in RunCMake.find_libraryWilliam R. Dieter2022-01-143-0/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge topic 'add-intel-copyright'Brad King2022-01-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34fcc6b586 Add Intel to the Copyright.txt file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6869
| * | | | | Add Intel to the Copyright.txt fileWilliam R. Dieter2022-01-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | Merge topic 'IntelLLVM-windows-link-with-driver'Brad King2022-01-181-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79921fb00c IntelLLVM: Set linker to compiler driver for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6866
| * | | | | | IntelLLVM: Set linker to compiler driver for WindowsWilliam R. Dieter2022-01-141-0/+13
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | CMake Nightly Date StampKitware Robot2022-01-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-01-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-01-161-1/+1
| | | | | |
* | | | | | Merge topic 'doc-LANG_STANDARD_REQUIRED'Craig Scott2022-01-152-5/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Help: Actual language standard can be higher than <LANG>_STANDARDCraig Scott2022-01-142-5/+18
| | |_|/ / | |/| | | | | | | | Fixes: #22885
* | | | | CMake Nightly Date StampKitware Robot2022-01-151-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'fix_file_offset'Brad King2022-01-141-14/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | file: Fix types of the OFFSET and LIMIT argumentsAlexey Edelev2022-01-131-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'doc-DEPRECATION-format'Brad King2022-01-143-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9b237b6d7 Help: Document formatting of DEPRECATION target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6864
| * | | | | Help: Document formatting of DEPRECATION target propertyBrad King2022-01-133-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Also add a test case to verify it.
* | | | | | Merge topic 'update-libuv'Brad King2022-01-1421-915/+170
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | libuv: add cast to pass sockaddr_storage as sockaddr on windowsBrad King2022-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Tell the compiler the structs are layout-compatible.
| * | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2022-01-1321-914/+169
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | # By libuv upstream * upstream-libuv: libuv 2022-01-13 (2fbfa035)
| | * | | | libuv 2022-01-13 (2fbfa035)libuv upstream2022-01-1321-914/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit 2fbfa0358b3bb920ddd1c2747d4887b35b9ac161 (v1.x).
* | | | | | CMake Nightly Date StampKitware Robot2022-01-141-1/+1
|/ / / / /
* | | | | Merge topic 'cudatoolkit_find_cufft_static_nocallback'Brad King2022-01-132-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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
generated by cgit v0.12 at 2025-01-09 14:26:58 (GMT)