mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,727 Commits 2 Branches 401 Tags
eb73f343f01ef5eb9bd07285ea67304cecf51a3f
Commit Graph

50727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King eb73f343f0 Merge topic 'doc-cstd' 
48645cabe3 Help: MSVC now has C standard level flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5500
 2020-11-13 09:43:08 -05:00
Brad King ef8c93cd60 Merge branch 'release-3.18' into master 2020-11-13 09:42:01 -05:00
Brad King 15931155bb Merge branch 'release-3.19' 2020-11-13 09:41:25 -05:00
Brad King 72f8237422 Merge topic 'xcode-compiler-id-path' 
bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5506
 2020-11-13 09:41:25 -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 f73aacc746 Merge branch 'release-3.19' 2020-11-13 09:40:09 -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
Brad King 5ba7559966 Merge topic 'xcode-compiler-id-arch' 
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
Kitware Robot 8b8f0197eb CMake Nightly Date Stamp 2020-11-13 00:01:08 -05: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
Michael Hirsch 48645cabe3 Help: MSVC now has C standard level flags 2020-11-12 09:41:24 -05:00
Brad King 8be538b092 Merge topic 'ctest-batch' 
aa754e2913 CTest: Remove additional batch test variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5494
 2020-11-12 09:14:39 -05:00
Brad King 7ac092bd39 Merge topic 'suppress-link-messages' 
8e2eba6b4c MSVC: Suppress rc/mt/link output unless verbose is requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5492
 2020-11-12 09:13:50 -05:00
Brad King 08b0668043 Merge topic 'FindBLAS/OpenBLAS-OpenMP' 
f7f3d8987a FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5487
 2020-11-12 09:12:56 -05:00
Brad King a97987bda9 Merge branch 'release-3.19' 2020-11-12 09:10:54 -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 ccd87d89d8 Merge topic 'FindPython-version-range-fix-tests' 
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 04881b20fa Merge branch 'release-3.19' 2020-11-12 09:09:52 -05:00
Brad King 10c46689ec Merge topic 'FindRuby-vs-runtimes' 
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
Kitware Robot 8705f9116e CMake Nightly Date Stamp 2020-11-12 00:01:09 -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
Brad King 8b9497e3e5 Merge branch 'release-3.19' 2020-11-11 15:22:26 -05:00
Brad King 9450ab0d23 Merge topic 'envvar_versions' 
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 fd8eef0341 Merge topic 'FortranCInterface-CMP0056' 
15e77fbd40 FortranCInterface: Honor CMAKE_EXE_LINKER_FLAGS under CMP0056

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5483
 2020-11-11 09:41:10 -05:00
Brad King f1c613edcf Merge branch 'release-3.19' 2020-11-11 09:34:17 -05:00
Brad King 5e3b0aa9b2 Merge topic 'ninja-cleandead-no-dyndep' 
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:17 -05: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 1379ec2ce2 Merge branch 'release-3.19' 2020-11-11 09:33:02 -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 566ad7c61e Merge topic 'android-abi' 
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
Brad King adfc6044db Merge branch 'release-3.19' 2020-11-11 09:31:55 -05:00
Brad King c966c71956 Merge topic 'get_filename_component-clarification' 
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
Seth R Johnson aa754e2913 CTest: Remove additional batch test variables 
Follow up commit f984296ba8 (CTest: Remove unfinished batch test mode,
2017-12-08, v3.11.0-rc1~217^2).
 2020-11-11 09:12:14 -05:00
Eisuke Kawashima f7f3d8987a FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC 
Fixes: #16221
 2020-11-11 09:10:22 -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
Orgad Shaneh 8e2eba6b4c MSVC: Suppress rc/mt/link output unless verbose is requested 
Output like the following is typically not interesting at all:
LINK : program database F:\Project\Project.pdb missing; performing full link
   Creating library Project.lib and object Project.exp

Fixes #21422
 2020-11-11 14:46:58 +02:00
Kitware Robot e31ccdd4c4 CMake Nightly Date Stamp 2020-11-11 00:01:36 -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 f3af0ec814 Merge topic 'versionadded_commands' 
c705279bae Help: Add `.. versionadded` directives to commands documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5481
 2020-11-10 09:44:02 -05:00
Brad King f4f3fca99f Merge topic 'android-root' 
cbc51a8be3 Android: restructure android search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: huangqinjin <huangqinjin@gmail.com>
Merge-request: !5479
 2020-11-10 09:42:31 -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
Brad King 9321379d7e Merge branch 'release-3.19' 2020-11-10 09:40:54 -05:00