mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-13 02:29:02 -06:00
Code Issues Packages Projects Releases Wiki Activity
50,412 Commits 2 Branches 390 Tags
fa0c02e9dfbc7880653a058a90634d3cea66cf1b
Commit Graph

50412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
fa0c02e9df ci: update to use CMake 3.19.0 2020-11-18 11:48:16 -05:00
Brad King
222bf361e4 CMake 3.19.0 v3.19.0 2020-11-18 07:46:23 -05:00
Brad King
b9239c08ed Merge branch 'release-3.18' into release-3.19 2020-11-18 07:40:58 -05:00
Brad King
513fff7508 Merge topic 'rename_cuda_memcheck' into release-3.19 
fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5514
 2020-11-18 07:29:54 -05:00
Brad King
1a059d91af CMake 3.18.5 v3.18.5 2020-11-18 06:34:00 -05:00
Brad King
ca9a182d23 Merge topic 'gitlab-ci-msvc-14.28' into release-3.19 
a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5513
 2020-11-17 16:40:43 -05:00
Tobias Ribizel
fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer 2020-11-17 21:06:30 +01:00
Brad King
a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28 2020-11-17 13:34:51 -05:00
Brad King
c9764c902d Merge topic 'msvc-14.28' into release-3.19 
c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5512
 2020-11-17 13:10:32 -05:00
Brad King
c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK 
Issue: #21446
 2020-11-17 11:50:50 -05:00
Craig Scott
c22f434c83 Merge topic 'xcode-clean-lib-paths' into release-3.19 
b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5511
 2020-11-16 14:23:52 -05:00
Brad King
87ef956865 Merge topic 'ci-fedora33' into release-3.19 
6e35919e15 gitlab-ci: use Fedora 33 to build sources
061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33
bd62d2ecf3 ci: update to Fedora 33 for Linux builds
ada3170625 ci: install gmock in the Fedora 31 image
86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9
6a83417908 clang-tidy: ignore new warnings from newer versions
d2b648ec4c clang-tidy: ignore `misc-no-recursion`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5504
 2020-11-16 11:16:12 -05:00
Gusts Kaksis
b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions 2020-11-16 07:14:57 +11:00
Brad King
c35c4ae85c Merge topic 'qtifw-archivegen' into release-3.19 
5ab75dd7dd CPack/IFW: Locate the archivegen utility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5503
 2020-11-13 09:45:32 -05:00
Brad King
140e06e344 Merge topic 'qtifw-4.0' into release-3.19 
63ae96a317 CPack/IFW: Add support for QtIFW 4.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5502
 2020-11-13 09:44:27 -05:00
Brad King
ddd6979aab Merge topic 'doc-cstd' into release-3.19 
48645cabe3 Help: MSVC now has C standard level flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5500
 2020-11-13 09:43:07 -05:00
Brad King
d8b50fd185 Merge topic 'xcode-compiler-id-path' into release-3.19 
bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs
a070565a66 Merge branch 'FindRuby-restore-VENDORLIB_DIR' into release-3.18
3969c86b51 Merge branch 'cuda_vs_skip_computation' into release-3.18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5506
 2020-11-13 09:41:25 -05:00
Brad King
18f152e9c0 Merge topic 'xcode-compiler-id-arch' into release-3.19 
98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5505
 2020-11-13 09:40:09 -05:00
Ben Boeckel
6e35919e15 gitlab-ci: use Fedora 33 to build sources 2020-11-13 08:58:17 -05:00
Ben Boeckel
061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33 2020-11-13 08:58:17 -05:00
Ben Boeckel
bd62d2ecf3 ci: update to Fedora 33 for Linux builds 2020-11-13 08:37:07 -05:00
Brad King
ada3170625 ci: install gmock in the Fedora 31 image 
The gmock libraries are referenced by GTest's CMake package files.

While at it, also explicitly install gettext.  It is installed already,
but make it explicit for future testing of the FindGettext module.

(cherry picked from commit 585cc7c930)
 2020-11-13 08:37:03 -05:00
Ben Boeckel
86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9 2020-11-12 17:55:31 -05:00
Ben Boeckel
6a83417908 clang-tidy: ignore new warnings from newer versions 
These warnings can be fixed in the future, but are ignored for now.
 2020-11-12 17:55:31 -05:00
Ben Boeckel
d2b648ec4c clang-tidy: ignore misc-no-recursion 
CMake has intentional recursion in its codebase, so avoid warning about
occurrences.
 2020-11-12 17:55:31 -05:00
Erlend Egeberg Aasland
5ab75dd7dd CPack/IFW: Locate the archivegen utility 
Fixes: #21427
 2020-11-12 21:22:53 +01:00
Brad King
3e2a2d16a6 Merge branch 'xcode-compiler-id-path' into release-3.18 
Merge-request: !5506
 2020-11-12 12:24:00 -05:00
Brad King
bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs 
When targeting a platform that supports multiple architectures, Xcode
may choose to build all of them in our small compiler id project.
Update the regex we use to extract the path to the compiler from
the Xcode output to account for this.

Fixes: #21425
 2020-11-12 12:20:34 -05:00
Brad King
98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id 
In commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple
Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) we forgot to update the
compiler id architecture selection added by commit 26673bf480 (Xcode:
Explicitly specify default native architecture on macOS, 2020-07-16,
v3.18.1~20^2).

Issue: #21425
 2020-11-12 11:26:19 -05:00
Erlend Egeberg Aasland
63ae96a317 CPack/IFW: Add support for QtIFW 4.0 
installerbase v4.0 segfaults on macOS if you pass `--framework-version`,
so re-order flags to try `--version` first.

Fixes: #21426
 2020-11-12 09:53:51 -05:00
Michael Hirsch
48645cabe3 Help: MSVC now has C standard level flags 2020-11-12 09:41:24 -05:00
Brad King
d579c4152f Merge topic 'FindPython-version-range-fix-tests' into release-3.19 
a00603af0b FindPython: Fix version range tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5497
 2020-11-12 09:10:53 -05:00
Brad King
d8aaa06b54 Merge topic 'FindRuby-vs-runtimes' into release-3.19 
d4a16427e2 FindRuby: Consider more VS runtime suffix combinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5486
 2020-11-12 09:09:52 -05:00
Brad King
e23f9d8a02 Merge topic 'envvar_versions' into release-3.19 
5934a6275c Help: Fix `.. versionadded` directives in environment variable docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5498
 2020-11-11 15:22:26 -05:00
Nikita Nemkin
5934a6275c Help: Fix .. versionadded directives in environment variable docs 
Many environment variables were documented late and got
assigned wrong versions by the script.
(The whole Help/envvar section was only added in 3.10).

Issue: #19715
 2020-11-11 20:38:18 +05:00
Marc Chevrier
a00603af0b FindPython: Fix version range tests 
Tests must be successful when multiple versions are installed.
 2020-11-11 16:16:49 +01:00
Brad King
b1208722c5 Merge topic 'ninja-cleandead-no-dyndep' into release-3.19 
c5011399c5 Ninja: Avoid cleandead with dyndep bindings for Fortran module dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5490
 2020-11-11 09:34:16 -05:00
Brad King
6f61b59e74 Merge topic 'android-abi' into release-3.19 
a585b75df9 Android: Use NDK_KNOWN_DEVICE_ABI{32,64}S instead of NDK_DEFAULT_ABIS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5488
 2020-11-11 09:33:02 -05:00
Brad King
7791f16cfb Merge topic 'get_filename_component-clarification' into release-3.19 
c0e05671d3 Help/get_filename_component: clarify NAME_W[L]E summaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5489
 2020-11-11 09:31:55 -05:00
Silvio Traversaro
d4a16427e2 FindRuby: Consider more VS runtime suffix combinations 
These are needed to find recent Ruby versions for builds using
recent VS versions.

Fixes: #21066
 2020-11-11 08:30:42 -05:00
Brad King
c5011399c5 Ninja: Avoid cleandead with dyndep bindings for Fortran module dependencies 
The Ninja `cleandead` tool does not account for implicit outputs
discovered by `dyndep` bindings and can remove Fortran `.mod` files that
are still needed.  Disable the `cleandead` step when using `dyndep`
bindings.

Fixes: #21406
 2020-11-10 15:16:28 -05:00
Haibo Huang
a585b75df9 Android: Use NDK_KNOWN_DEVICE_ABI{32,64}S instead of NDK_DEFAULT_ABIS 
Revise logic from commit 1ab574a0f4 (Android: Add support for NDK r22,
2020-10-07, v3.19.0-rc1~18^2) that loads ABI tables from the NDK.

`NDK_DEFAULT_ABIS` means the abis to build by default.
Use `NDK_KNOWN_DEVICE_ABI{32,64}S` instead.

In practise they have never been different. Fix to make it more precise.
 2020-11-10 11:05:36 -08:00
Ben Boeckel
c0e05671d3 Help/get_filename_component: clarify NAME_W[L]E summaries 
There was an ambiguity in the wording with the meaning of "or" typically
meaning exclusive-or in prose. Instead, ensure that the easiest parsing
is clear that the directory part is always removed.
 2020-11-10 10:06:24 -05:00
Brad King
0d182c02f6 Merge topic 'python3.10' into release-3.19 
bb2ebbf241 FindPython{Interp,Libs}: Add support for version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5482
 2020-11-10 09:40:54 -05:00
Miro Hrončok
bb2ebbf241 FindPython{Interp,Libs}: Add support for version 3.10 
Extend the change from commit 23cd98a66a (FindPython: Add support of
version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy
`FindPython{Interp,Libs}` modules too.
 2020-11-09 11:44:13 -05:00
Brad King
b754896004 Merge topic 'doc-html-lang' into release-3.19 
f25e4313ac Utilities/Sphinx: Tell Sphinx that documentation is written in English

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5480
 2020-11-09 10:51:08 -05:00
Brad King
f25e4313ac Utilities/Sphinx: Tell Sphinx that documentation is written in English 
Fixes: #21409
 2020-11-09 10:15:35 -05:00
Brad King
7a04f45722 CMake 3.19.0-rc3 v3.19.0-rc3 2020-11-06 09:19:57 -05:00
Brad King
b80e39d0f6 Merge topic 'apple-v4-tbd-file-arch-lookup' into release-3.19 
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
 2020-11-06 07:58:54 -05:00
Brad King
dd8c91a4f3 Merge topic 'cmake-gui-file-dialog-crash' into release-3.19 
5f782119c8 cmake-gui: Restore workaround for crash in file dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5472
 2020-11-06 07:57:51 -05:00