mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-03 13:18:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
53,569 Commits 2 Branches 392 Tags
3a0effcd16f657a13390cfd27a13ca334df1ac98
Commit Graph

53569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuichiro Utsumi
3a0effcd16 FujitsuClang: Set CMAKE_<LANG>_COMPILER_AR and CMAKE_<LANG>_COMPILER_RANLIB 
Fixes: #22337
 2021-06-29 09:31:53 -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
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
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
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
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
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
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
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
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
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
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
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
9da3dea754 Merge topic 'ninja-lwyu-flag-order' into release-3.21 
d7159f9591 Ninja: Fix LINK_WHAT_YOU_USE link flag placement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6263
 2021-06-28 09:20:10 -04:00
Brad King
5430379ee6 Merge topic 'yasm-no-deps' into release-3.21 
f03d54bfc1 ASM_NASM: Do not generate depfiles with YASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6265
 2021-06-28 09:19:06 -04:00
Ben Boeckel
894645d4a6 Help/CMP0102: mention the varible that controls CMP0102 warnings 
This was missed in the review of !4150, but was noticed during
discussion of #22353.
 2021-06-28 08:17:25 -04:00
Brad King
93c718791e VS: Use 64-bit MSBuild in VS 2022 
Visual Studio 17 2022 is now a 64-bit native application.  It places the
64-bit `MSBuild.exe` in the `PATH` of VS command prompts, so prefer it
for this version and above.

This was previously attempted for older VS versions, but reverted by
commit f3cedf381e (VS: Revert "Use MSBuild matching toolset host
architecture", 2019-03-12, v3.14.0~1^2).  For now, do not use the 64-bit
MSBuild for VS 16 and below.

Fixes: #18219
 2021-06-25 12:45:53 -04:00
Brad King
c46b265839 VS: Add Visual Studio 17 2022 generator 
Fixes: #22339
 2021-06-25 12:45:44 -04:00
Brad King
a95cbf3890 Tests: Shorten RunCMake.GenEx-* case names 
Reduce the length of the longest path on disk needed by the tests.
 2021-06-25 11:29:46 -04:00
Brad King
b610b7a35c VS: Update v142 CL flag table for VS 17.0 Preview 1 
Run the command

    python3 Source/cmConvertMSBuildXMLToJSON.py -t v142 \
        'c:/.../MSBuild/Microsoft/VC/v160/1033/cl.xml'

To generate `v142_CL.json` locally.  Manually move new and updated
settings over to `Templates/MSBuild/FlagTables/v142_CL.json`.
 2021-06-25 10:07:32 -04:00
Brad King
43375c6418 Help: Remove unnecessary Sphinx versionadded markup in VS toolset selection 
In a document that says "New in version 3.14", we do not need any blocks
that say "New in version 3.8".
 2021-06-25 10:07:31 -04:00
Đoàn Trần Công Danh
d7159f9591 Ninja: Fix LINK_WHAT_YOU_USE link flag placement 
Move `-Wl,--no-as-needed` from the `<FLAGS>` placeholder to
`<LINK_FLAGS>`, as it is in the Makefile generators.

Fixes: #22342
 2021-06-25 08:45:47 -04:00
Brad King
4a0e68266b Merge topic 'Help-UseJava-reorganization' into release-3.21 
af9bd6c53f Help: UseJava reorganization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6262
 2021-06-25 07:24:46 -04:00
Brad King
fff5994e99 Merge topic 'fujitsu-ipo' into release-3.21 
96e362fdc9 Fujitsu: Add IPO support for Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6261
 2021-06-25 07:23:58 -04:00
Brad King
647e33d53e Merge topic 'FindOpenMP-fujitsu' into release-3.21 
b3bf33539b FindOpenMP: Link with OpenMP flags on Fujitsu

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6260
 2021-06-25 07:22:54 -04:00
Gregor Jasny
f03d54bfc1 ASM_NASM: Do not generate depfiles with YASM 
In 3aec26660a (Merge topic 'nasm_add_deps', 2021-03-03) the
ASM_NASM language enabled the generation of GCC compatible
depfiles for NASM. Unfortunatly, those are not supported by YASM.

Fixes: #22341
 2021-06-25 12:28:02 +02:00
Marc Chevrier
af9bd6c53f Help: UseJava reorganization 
Fixes: #22155
 2021-06-24 11:04:01 -04:00
Eisuke Kawashima
b3bf33539b FindOpenMP: Link with OpenMP flags on Fujitsu 
Fixes: #22332
 2021-06-24 09:09:49 -04:00
Paul Zehner
96e362fdc9 Fujitsu: Add IPO support for Fortran 2021-06-24 09:02:15 -04:00
Brad King
9a704fd37e Merge topic 'bootstrap-_FILE_OFFSET_BITS-64' into release-3.21 
a4b6743a3b bootstrap: Compile with _FILE_OFFSET_BITS=64 on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6259
 2021-06-24 08:33:57 -04:00
Brad King
a4b6743a3b bootstrap: Compile with _FILE_OFFSET_BITS=64 on Linux 
To avoid problems accessing filesystem, explicitly use 64-bit file
offsets in case the compilation model is 32-bit.  This change was made
for the main CMake build by commit 5b10f96793 (Linux: Compile with
_FILE_OFFSET_BITS=64 on 32-bit Linux, 2020-09-23, v3.19.0-rc1~112^2),
but conditionally on 32-bit Linux.  For bootstrap, just always add the
definition instead of trying to detect the architecture.

Fixes: #22328
 2021-06-23 12:46:37 -04:00
Brad King
0aae790a5e CMake 3.21.0-rc1 v3.21.0-rc1 2021-06-23 09:01:47 -04:00
Brad King
60c5188fe5 Merge topic 'cuda-rules-override' into release-3.21 
1d9009c27a CUDA: Implement CMAKE_USER_MAKE_RULES_OVERRIDE[_CUDA]

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6253
 2021-06-23 08:55:26 -04:00
Seth R Johnson
1d9009c27a CUDA: Implement CMAKE_USER_MAKE_RULES_OVERRIDE[_CUDA] 
This is implemented by other languages, and is documented for
all languages.  This was accidentally left out of CUDA.
 2021-06-22 09:59:01 -04:00
Brad King
6d9fec6c0b Merge branch 'release-3.20' into release-3.21 2021-06-21 11:49:10 -04:00
Brad King
efa5e1f367 CMake 3.20.5 v3.20.5 2021-06-21 11:23:19 -04:00
Brad King
25e82666e4 Help: Add 3.20 release note section for 3.20.{3,4,5} 
Make it clear that the notes for these patch releases were not
forgotten, and that there were simply no changes to documented features
or interfaces.
 2021-06-21 11:20:33 -04:00
Brad King
dec927716e Merge branch 'release-3.20' into release-3.21 2021-06-21 10:06:46 -04:00
Brad King
b948b46668 Merge topic 'ep-git-update-commit-ref' into release-3.21 
360ff17dc6 ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6249
 2021-06-21 10:03:36 -04:00
Brad King
782b6bfc26 Merge topic 'test-xcode-13' into release-3.21 
1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6248
 2021-06-21 10:01:25 -04:00
Brad King
6438a03c73 Merge topic 'tutorial-sphinx-targets' into release-3.21 
73898c4922 Tutorial: Make code snippets linkable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6247
 2021-06-21 09:59:56 -04:00