mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 12:11:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
53,679 Commits 2 Branches 390 Tags
eb2ea3db8beffd0779b034b5ee4697cfef3e9088
Commit Graph

53679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
eb2ea3db8b Merge topic 'compiler-id-msvc-has-include' 
c6aaaf066a DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6284
 2021-06-30 07:26:25 -04:00
Kitware Robot
82183329a5 CMake Nightly Date Stamp 2021-06-30 00:01:09 -04:00
Brad King
c6aaaf066a DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs 
Since commit bd844387df (ROCMClang: Add the ROCm toolkit derived clang
compiler to CMake, 2020-08-28, v3.21.0-rc1~66^2~6), our generated
compiler id source file contains a preprocessor condition of the form

    #elif ... && __has_include(...)

When MSVC is invoked with no include directories in the `INCLUDE`
environment variable or in `-I` flags, its implementation of
`__has_include` errors out immediately.  This breaks identification of
the compiler.

Work around the problem by adding a fallback attempt to compile the
identification source using a dummy include directory.
 2021-06-29 12:55:35 -04:00
Brad King
d837efafa5 Merge topic 'test-CTestTestSerialInDepends-lockfile' 
a5011a2fbf Tests: Cleanup CTestTestSerialInDepends lockfile at test start

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6273
 2021-06-29 09:24:49 -04:00
Brad King
fb02657b6a Merge topic 'update-kwsys' into release-3.21 
7e9a32947b Merge branch 'upstream-KWSys' into update-kwsys
bf4ae1c2b2 KWSys 2021-06-28 (0648cb1a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Björn Esser <besser82@fedoraproject.org>
Merge-request: !6266
 2021-06-29 09:23:28 -04:00
Brad King
0d9f8b0267 Merge branch 'release-3.21' 2021-06-29 09:23:28 -04:00
Brad King
5bc933ce96 Merge topic 'update-kwsys' 
7e9a32947b Merge branch 'upstream-KWSys' into update-kwsys
bf4ae1c2b2 KWSys 2021-06-28 (0648cb1a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Björn Esser <besser82@fedoraproject.org>
Merge-request: !6266
 2021-06-29 09:23:28 -04:00
Brad King
543394af28 Merge topic 'tests-tolerate-NINJA_STATUS' into release-3.21 
63177678d0 Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6271
 2021-06-29 09:22:05 -04:00
Brad King
3e8fc845f5 Merge branch 'release-3.21' 2021-06-29 09:22:05 -04:00
Brad King
dd6ce26f7e Merge topic 'tests-tolerate-NINJA_STATUS' 
63177678d0 Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6271
 2021-06-29 09:22:05 -04:00
Brad King
a158ac723e Merge branch 'release-3.21' 2021-06-29 09:21:14 -04:00
Brad King
e3066e19df Merge topic 'test-driver-local-var' 
1e3d3c5284 TestDriver: Avoid declaring local variable after statement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6276
 2021-06-29 09:21:14 -04:00
Brad King
9b4a5b4120 Merge topic 'test-driver-local-var' into release-3.21 
1e3d3c5284 TestDriver: Avoid declaring local variable after statement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6276
 2021-06-29 09:21:13 -04:00
Brad King
901a910391 Merge branch 'release-3.21' 2021-06-29 09:20:17 -04:00
Brad King
4eb78f774c Merge topic 'curl-schannel-ALPN-length' into release-3.21 
3faa3d3a38 curl: backport upstream fix to 7.77.0 regression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6280
 2021-06-29 09:20:17 -04:00
Brad King
2c5b758bba Merge topic 'curl-schannel-ALPN-length' 
3faa3d3a38 curl: backport upstream fix to 7.77.0 regression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6280
 2021-06-29 09:20:17 -04:00
Kitware Robot
06d2c3fce4 CMake Nightly Date Stamp 2021-06-29 00:01:13 -04:00
Brad King
480bd71b16 Merge topic 'genex-versionadded' into release-3.21 
7993aa3075 Help: Add versionadded tags to cmake-generator-expressions(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6270
 2021-06-28 14:01:36 -04:00
Brad King
e062d4a2a3 Merge branch 'release-3.21' 2021-06-28 14:01:36 -04:00
Brad King
34f879d99e Merge topic 'genex-versionadded' 
7993aa3075 Help: Add versionadded tags to cmake-generator-expressions(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6270
 2021-06-28 14:01:36 -04:00
Brad King
fe3197cfcc Merge topic 'Help-CMP0102-mention-warning-variable' into release-3.21 
894645d4a6 Help/CMP0102: mention the varible that controls CMP0102 warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6275
 2021-06-28 14:00:28 -04:00
Brad King
97cc0781e4 Merge branch 'release-3.21' 2021-06-28 14:00:28 -04:00
Brad King
9b55bd480d Merge topic 'Help-CMP0102-mention-warning-variable' 
894645d4a6 Help/CMP0102: mention the varible that controls CMP0102 warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6275
 2021-06-28 14:00:28 -04:00
Brad King
efb4cef630 Merge topic 'doc-3.21-relnotes-supportedPlatforms' into release-3.21 
82ea0aeae4 Help: Clarify 3.21 release note on supportedPlatforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6277
 2021-06-28 13:59:18 -04:00
Brad King
d7b5c58d88 Merge branch 'release-3.21' 2021-06-28 13:59:18 -04:00
Brad King
cefaff9b84 Merge topic 'doc-3.21-relnotes-supportedPlatforms' 
82ea0aeae4 Help: Clarify 3.21 release note on supportedPlatforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6277
 2021-06-28 13:59:18 -04:00
Brad King
7e9a32947b Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-06-28 (0648cb1a)
 2021-06-28 13:32:23 -04:00
KWSys Upstream
bf4ae1c2b2 KWSys 2021-06-28 (0648cb1a) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 0648cb1ac5c91430b190f32319c528345b280dc3 (master).

Upstream Shortlog
-----------------

Ben Boeckel (2):
      df91e5f1 EncodingC: use NULL for pointers
      ab959cd2 SystemInformation: fix typo in comment

Björn Esser (2):
      b4a2a03c testDynamicLoader: Use LIBDL_SO macro if defined.
      b954dd54 testDynamicLoader: Use LIBC_SO if LIBDL_SO is not defined by glibc anymore.
 2021-06-28 13:32:22 -04:00
Brad King
3faa3d3a38 curl: backport upstream fix to 7.77.0 regression 
Backport upstream curl commit `ee97f1769` (schannel: set ALPN length
correctly for HTTP/2, 2021-05-26) to get a fix to curl issue 7138,
a regression in 7.77.0.

Fixes: #22355
 2021-06-28 12:59:23 -04:00
Brad King
20bed8d2ac Merge topic 'ci-base-images' into release-3.21 
53cb34cb23 ci: add freeglut to Debian and Fedora base images
b07253f754 ci: update keyserver URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6279
 2021-06-28 12:10:44 -04:00
Brad King
bb17ec20e8 Merge branch 'release-3.21' 2021-06-28 12:10:44 -04:00
Brad King
aa8b116e67 Merge topic 'ci-base-images' 
53cb34cb23 ci: add freeglut to Debian and Fedora base images
b07253f754 ci: update keyserver URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6279
 2021-06-28 12:10:44 -04:00
Brad King
53cb34cb23 ci: add freeglut to Debian and Fedora base images 2021-06-28 11:10:30 -04:00
Brad King
b07253f754 ci: update keyserver URL 
The `sks-keyservers.net` keyserver pool is no longer provided.
Switch to `keyserver.ubuntu.com` instead.
 2021-06-28 10:59:56 -04:00
FeRD (Frank Dana)
7993aa3075 Help: Add versionadded tags to cmake-generator-expressions(7) 2021-06-28 10:40:11 -04:00
NAKAMURA Takumi
63177678d0 Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behavior 
FYI, NINJA_STATUS is "[%f/%t] " by default.
 2021-06-28 10:38:05 -04:00
Alex Sweet
a5011a2fbf Tests: Cleanup CTestTestSerialInDepends lockfile at test start 
When any test under CTestTestSerialInDepends starts, delete the lockfile
for that test in case it wasn't deleted at the end of the last test run.

Fixes: #22351
 2021-06-28 10:32:05 -04:00
Brad King
3907b6691d Merge branch 'release-3.21' 2021-06-28 10:13:43 -04:00
Brad King
73f3a8f8ba Merge topic 'p1689r4-updates' 
cf22263531 Help/dev/experimental: Link to published P1689R4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6278
 2021-06-28 10:13:43 -04:00
Brad King
5694362d98 Merge topic 'p1689r4-updates' into release-3.21 
cf22263531 Help/dev/experimental: Link to published P1689R4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6278
 2021-06-28 10:13:42 -04:00
Brad King
cf22263531 Help/dev/experimental: Link to published P1689R4 2021-06-28 09:58:52 -04:00
Brad King
82ea0aeae4 Help: Clarify 3.21 release note on supportedPlatforms 
Avoid implying that the field is always present.

Fixes: #22352
 2021-06-28 09:53:48 -04:00
Brad King
1e3d3c5284 TestDriver: Avoid declaring local variable after statement 
Move a declaration added by commit 3f6ff4b5db (create_test_sourcelist:
add test driver option to run all tests, 2021-04-27, v3.21.0-rc1~257^2)
into its own scope.
 2021-06-28 09:28:15 -04:00
Brad King
c8d2e81e09 Merge topic 'target_compile_features-only-apply-to-enabled-languages' 
a3cafa4237 compile_features: Ignore features that map to languages that aren't enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6255
 2021-06-28 09:26:02 -04:00
Brad King
c6223262a3 Merge topic 'Fortran-abi-f90' 
97e2828d14 Fortran: Subsume F90 check into ABI check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6250
 2021-06-28 09:23:45 -04:00
Brad King
117b1545a9 Merge topic 'vs2022' into release-3.21 
93c718791e VS: Use 64-bit MSBuild in VS 2022
c46b265839 VS: Add Visual Studio 17 2022 generator
b610b7a35c VS: Update v142 CL flag table for VS 17.0 Preview 1
43375c6418 Help: Remove unnecessary Sphinx versionadded markup in VS toolset selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6268
 2021-06-28 09:22:38 -04:00
Brad King
bf5127d383 Merge branch 'release-3.21' 2021-06-28 09:22:38 -04:00
Brad King
be78a9bf68 Merge topic 'vs2022' 
93c718791e VS: Use 64-bit MSBuild in VS 2022
c46b265839 VS: Add Visual Studio 17 2022 generator
b610b7a35c VS: Update v142 CL flag table for VS 17.0 Preview 1
43375c6418 Help: Remove unnecessary Sphinx versionadded markup in VS toolset selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6268
 2021-06-28 09:22:38 -04:00
Brad King
5b44b7eee3 Merge topic 'test-RunCMake.GenEx-names' into release-3.21 
a95cbf3890 Tests: Shorten RunCMake.GenEx-* case names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6269
 2021-06-28 09:21:16 -04:00
Brad King
0b5e08b9b0 Merge branch 'release-3.21' 2021-06-28 09:21:16 -04:00