summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'libuv-mingw-arm'Brad King2021-07-191-2/+6
|\ | | | | | | | | | | | | 1aba3a8367 libuv: Fix building with mingw toolchains for ARM/AArch64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6354
| * libuv: Fix building with mingw toolchains for ARM/AArch64Martin Storsjö2021-07-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of f9ad802fa5dd5afe6730f8e00cfdbf98f1d7a969 from the v1.x branch from upstream libuv: mingw: fix building for ARM/AArch64 Don't use x86 inline assembly in these cases, but fall back to __sync_fetch_and_or, similar to _InterlockedOr8 in the MSVC case. This corresponds to what is done in src/unix/atomic-ops.h, where ARM/AArch64 cases end up implementing cmpxchgi with __sync_val_compare_and_swap. PR-URL: https://github.com/libuv/libuv/pull/3236 Reviewed-By: Jameson Nash <vtjnash@gmail.com>
* | Merge branch 'release-3.21'Brad King2021-07-190-0/+0
|\ \
| * \ Merge topic 'TestDriver-time.h-lint' into release-3.21Brad King2021-07-191-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bb3d457cb TestDriver: use `CM_NULL` to avoid lints about `nullptr` usage 32ff836e2a TestDriver: suppress deprecated header lints for time.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6352
* | \ \ Merge topic 'TestDriver-time.h-lint'Brad King2021-07-191-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 0bb3d457cb TestDriver: use `CM_NULL` to avoid lints about `nullptr` usage 32ff836e2a TestDriver: suppress deprecated header lints for time.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6352
| * | | TestDriver: use `CM_NULL` to avoid lints about `nullptr` usageBen Boeckel2021-07-141-1/+1
| | | |
| * | | TestDriver: suppress deprecated header lints for time.hBen Boeckel2021-07-141-1/+1
| | | | | | | | | | | | | | | | Similar to the other includes, this one should be suppressed as well.
* | | | Merge branch 'release-3.21'Brad King2021-07-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'Help-ctest_memcheck-shared-args' into release-3.21Brad King2021-07-192-0/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85e740312f Help/ctest_test: add a comment to also update `ctest_memcheck` 731cfd45fd Help/ctest_memcheck: mention `ctest_test` arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6351
* | \ \ \ Merge topic 'Help-ctest_memcheck-shared-args'Brad King2021-07-192-0/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 85e740312f Help/ctest_test: add a comment to also update `ctest_memcheck` 731cfd45fd Help/ctest_memcheck: mention `ctest_test` arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6351
| * | | | Help/ctest_test: add a comment to also update `ctest_memcheck`Ben Boeckel2021-07-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Since these commands share a common argument parser, the documentation should be kept synchronized.
| * | | | Help/ctest_memcheck: mention `ctest_test` argumentsBen Boeckel2021-07-141-0/+5
| | |/ / | |/| | | | | | | | | | | | | | These are handled internally by inheriting `ctest_test`'s argument bindings. Synchronize the documentation.
* | | | Merge branch 'release-3.21'Brad King2021-07-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'vs2022' into release-3.21Brad King2021-07-199-13/+3505
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c7f918fb1 VS: Update Visual Studio 17 2022 generator for Preview 2 1ac1436b25 VS: Fix `/sourceDependencies` flag table entries for v143 919fc7fd5f VS: Remove broken EnableASAN entry from flag table for v143 3f19847b28 VS: Remove empty ExternalWarningLevel entry from flag table for v143 ccb6083cbe VS: Remove empty LanguageStandard entries from flag table for v143 c167de7e70 VS: Remove empty ConformanceMode entry from flag table for v143 993d706a17 VS: Populate `/JMC-` flag table entry for v143 a070d87e08 VS: Populate `-Qspectre-` flag table entry for v143 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Egor Pugin <egor.pugin@gmail.com> Merge-request: !6350
* | | | Merge topic 'vs2022'Brad King2021-07-199-13/+3505
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c7f918fb1 VS: Update Visual Studio 17 2022 generator for Preview 2 1ac1436b25 VS: Fix `/sourceDependencies` flag table entries for v143 919fc7fd5f VS: Remove broken EnableASAN entry from flag table for v143 3f19847b28 VS: Remove empty ExternalWarningLevel entry from flag table for v143 ccb6083cbe VS: Remove empty LanguageStandard entries from flag table for v143 c167de7e70 VS: Remove empty ConformanceMode entry from flag table for v143 993d706a17 VS: Populate `/JMC-` flag table entry for v143 a070d87e08 VS: Populate `-Qspectre-` flag table entry for v143 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Egor Pugin <egor.pugin@gmail.com> Merge-request: !6350
| * | | VS: Update Visual Studio 17 2022 generator for Preview 2Brad King2021-07-154-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | In particular, update to toolset `v143`. Fixes: #22339
| * | | VS: Fix `/sourceDependencies` flag table entries for v143Brad King2021-07-151-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the `/sourceDependencies[:directives]` table entries to properly distinguish the two options (because one is a prefix of the other), and to populate both `Generate*Dependencies` and `*DependenciesFile`. This is the manual update mentioned in commit 887e9df0c7 (VS: Update v142 CL flag table for VS 16.10, 2021-06-04, v3.21.0-rc1~77^2).
| * | | VS: Remove broken EnableASAN entry from flag table for v143Brad King2021-07-151-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit 7fce2d372e (VS: Revert "Add support for ASAN -fsanitize=address flag", 2021-04-26, v3.21.0-rc1~270^2) to the v143 flag table. Issue: #21081
| * | | VS: Remove empty ExternalWarningLevel entry from flag table for v143Brad King2021-07-151-7/+0
| | | |
| * | | VS: Remove empty LanguageStandard entries from flag table for v143Brad King2021-07-151-14/+0
| | | |
| * | | VS: Remove empty ConformanceMode entry from flag table for v143Brad King2021-07-151-7/+0
| | | |
| * | | VS: Populate `/JMC-` flag table entry for v143Brad King2021-07-151-0/+7
| | | | | | | | | | | | | | | | | | | | Apply the change from commit 049410c0b6 (VS: Populate `/JMC-` flag table entry for v142, 2019-01-24, v3.14.0-rc1~74^2~6) to the v143 flag table.
| * | | VS: Populate `-Qspectre-` flag table entry for v143Brad King2021-07-151-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit 43aa632f57 (VS: Populate `-Qspectre-` flag table entry for v142, 2019-01-24, v3.14.0-rc1~74^2~7) to the v143 flag table. Sort the longer options before the shorter ones. Remove the default variant with an empty switch.
| * | | VS: Populate `/Y-` flag table entry for v143Brad King2021-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | Apply the change from commit 460a146e2b (VS: Populate `/Y-` flag table entry for v142, 2019-01-24, v3.14.0-rc1~74^2~8) to the v143 flag table.
| * | | VS: Add `-Zc:inline[-]` flag table entry for v143Brad King2021-07-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit 0df3790371 (VS: Add `-Zc:inline[-]` flag table entry for v142, 2019-01-24, v3.14.0-rc1~74^2~9) to the v143 flag table.
| * | | VS: Fix `/analyze:log` flag mapping for v143Brad King2021-07-151-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit fb2e418c64 (VS: Fix `/analyze:log` flag mapping for v142, 2019-01-24, v3.14.0-rc1~74^2~10) to the v143 flag table.
| * | | VS: Remove the /MERGE flag from v143 link flag tableBrad King2021-07-151-9/+0
| | | | | | | | | | | | | | | | | | | | Apply the change from commit a9f992434d (VS: Remove the /MERGE flag from FlagTables, 2021-06-08, v3.21.0-rc1~58^2) to the v143 flag table.
| * | | VS: Map the link `/debug` flag for v143Brad King2021-07-151-10/+18
| | | | | | | | | | | | | | | | | | | | Apply the changes from commit 533f95c847 (VS: Map the link `/debug` flag for v142, 2019-01-24, v3.14.0-rc1~74^2~3) to the v143 flag table.
| * | | VS: Fix `/MANIFESTUAC:` link flag mapping for v143Brad King2021-07-151-25/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the changes from commit d2fcc6748a (VS: Fix `/MANIFESTUAC:NO` link flag mapping for v142, 2019-01-24, v3.14.0-rc1~74^2~4) and commit fd45cbf40e (VS: Fix `/MANIFESTUAC:` link flag mapping for v142, 2019-01-24, v3.14.0-rc1~74^2~1) to the v143 flag table.
| * | | VS: Add v143 flag tables for VS 17.0 Preview 2Brad King2021-07-152-0/+2982
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the commands python3 Source/cmConvertMSBuildXMLToJSON.py -t v143 \ 'c:/.../2022/Preview/MSBuild/Microsoft/VC/v170/1033/cl.xml' python3 Source/cmConvertMSBuildXMLToJSON.py -t v143 \ 'c:/.../2022/Preview/MSBuild/Microsoft/VC/v170/1033/link.xml' To generate `Templates/MSBuild/FlagTables/v143_{CL,Link}.json`. We can re-use `Templates/MSBuild/FlagTables/v14_LIB.json`.
| * | | VS: Add CSharp VS 2022 compiler version and flag table v143Brad King2021-07-152-0/+557
| | | | | | | | | | | | | | | | | | | | | | | | While the flag tables for C and C++ were generated from MSBuild `.xml` files, the CSharp flag tables were written by hand. Copy the `v142` flag table to use for the `v143` toolset.
| * | | VS: Improve v142 CL flag table LanguageStandard orderingBrad King2021-07-151-6/+6
| | | |
| * | | VS: Recognize CSharp VS 2019 compiler version v142Brad King2021-07-151-0/+4
| |/ /
* | | CMake Nightly Date StampKitware Robot2021-07-191-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2021-07-181-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2021-07-171-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2021-07-161-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-07-150-0/+0
|\ \ \ | |/ /
| * | Merge topic 'ci-use-3.21.0' into release-3.21Brad King2021-07-152-6/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | 79e139e3d3 ci: use CMake 3.21.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6349
* | | Merge topic 'ci-use-3.21.0'Brad King2021-07-152-6/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 79e139e3d3 ci: use CMake 3.21.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6349
| * | ci: use CMake 3.21.0Ben Boeckel2021-07-142-6/+6
| |/
* | Merge topic 'findblaslapack-cray'Brad King2021-07-152-26/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | 76487b04b1 Find{BLAS,LAPACK}: clean variables fc54e68c05 Find{BLAS,LAPACK}: improve found message on Cray Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6348
| * | Find{BLAS,LAPACK}: clean variablesSeth R Johnson2021-07-142-25/+31
| | |
| * | Find{BLAS,LAPACK}: improve found message on CraySeth R Johnson2021-07-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Cray compiler wrappers (implicitly tested on OLCF Spock) the BLAS and LAPACK libraries are automatically linked as necessary through the wrapper script and programming environment. With this change, the configure output is: ``` -- Found BLAS: implicitly linked <snip> -- Found LAPACK: implicitly linked ``` rather than ``` -- Found BLAS: 1 <snip> -- Found LAPACK: LAPACK_LIBRARIES-PLACEHOLDER-FOR-EMPTY-LIBRARIES ```
* | | CMake Nightly Date StampKitware Robot2021-07-151-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-07-140-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.21.0v3.21.0Brad King2021-07-141-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-07-140-0/+0
|\ \ \ | |/ /
| * | Merge topic 'armlink_armar_detection' into release-3.21Brad King2021-07-142-11/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 509ef50a06 ARMClang: Fix regression in check for working compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6346
* | \ \ Merge topic 'armlink_armar_detection'Brad King2021-07-142-11/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 509ef50a06 ARMClang: Fix regression in check for working compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6346