Commit Graph

51104 Commits

Author SHA1 Message Date
Brad King 922ad5c6b9 Merge topic 'execute_process-command-error'
e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5588
2020-12-14 07:07:46 -05:00
Kitware Robot 0a6c7cdd07 CMake Nightly Date Stamp 2020-12-14 00:01:19 -05:00
Kitware Robot 703a58cba3 CMake Nightly Date Stamp 2020-12-13 00:02:09 -05:00
Kitware Robot 4621ffb028 CMake Nightly Date Stamp 2020-12-12 00:01:10 -05:00
Brad King 0064981f6f Merge branch 'release-3.19' 2020-12-11 13:05:34 -05:00
Brad King 794aa36b1f Merge topic 'apple-silicon-host-arch'
b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts
5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5589
2020-12-11 13:05:34 -05:00
Brad King 23df57a3a7 Merge topic 'apple-silicon-host-arch' into release-3.19
b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts
5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5589
2020-12-11 13:05:34 -05:00
Brad King 0d9c43281f Merge branch 'release-3.19' 2020-12-11 13:04:37 -05:00
Brad King 1404741153 Merge topic 'doc-3_19_release-fixes'
3765a415df Merge branch 'master' into doc-3_19_release-fixes
ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language()
b4c02a0a1d Help: Re-sort indexes in the manuals
2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized
0816482302 Help: xref variable that cmake_minimum_required() sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5598
2020-12-11 13:04:37 -05:00
Brad King 0a5a883d53 Merge topic 'doc-3_19_release-fixes' into release-3.19
ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language()
b4c02a0a1d Help: Re-sort indexes in the manuals
2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized
0816482302 Help: xref variable that cmake_minimum_required() sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5598
2020-12-11 13:04:36 -05:00
Brad King 3765a415df Merge branch 'master' into doc-3_19_release-fixes 2020-12-11 10:39:14 -05:00
Craig Scott ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language()
Fixes: #21586
2020-12-11 18:25:42 +11:00
Kitware Robot adc6a4c540 CMake Nightly Date Stamp 2020-12-11 00:01:08 -05:00
Craig Scott b4c02a0a1d Help: Re-sort indexes in the manuals 2020-12-11 11:19:04 +11:00
Craig Scott 2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized 2020-12-11 11:19:04 +11:00
Craig Scott 0816482302 Help: xref variable that cmake_minimum_required() sets
The CMAKE_MINIMUM_REQUIRED_VERSION has long been set by
the cmake_minimum_required() command, but the command docs
never mentioned this. Only the variable's own docs stated this but
the variable isn't very discoverable without it being mentioned in
the command's docs as well.
2020-12-11 11:19:04 +11:00
Brad King b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts
Add test cases verifying that `CMAKE_APPLE_SILICON_PROCESSOR` set as
either a cache or environment variable causes that to be selected as the
host architecture.  Also verify that sources compile using whatever is
selected as the host architecture, even when the explicit setting is not
used.

Issue: #21554
2020-12-10 12:08:15 -05:00
Brad King 5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts
Since commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple
Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) we use `sysctl` to detect
that we are running on Apple Silicon in a way that pierces Rosetta.
This always sets `CMAKE_HOST_SYSTEM_PROCESSOR` to be `arm64` on such
hosts.  However, macOS offers strong support for running processes under
an emulated `x86_64` architecture.

Teach CMake to select either `arm64` or `x86_64` as the host
architecture on Apple Silicon based on the architecture of its own
process.  When CMake is built as a universal binary, macOS will select
whichever slice (architecture) is appropriate under the user's shell,
and `CMAKE_HOST_SYSTEM_PROCESSOR` will match.

Also offer a `CMAKE_APPLE_SILICON_PROCESSOR` variable and environment
variable to provide users with explicit control over the host
architecture selection regardless of CMake's own architecture.

Finally, if `CMAKE_OSX_ARCHITECTURES` is not set, pass explicit flags to
the toolchain to use selected host architecture instead of letting the
toolchain pick.

Fixes: #21554
2020-12-10 12:08:13 -05:00
Brad King 8240131ff7 Merge branch 'release-3.19' 2020-12-10 12:05:17 -05:00
Brad King fd6c1e5a73 Merge topic 'rel-macos-apple-silicon'
56a075eb5d ci: update macOS package to produce universal binaries
b184cc256b ci: do not use sccache for macOS packaging
41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages
b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5595
2020-12-10 12:05:17 -05:00
Brad King 0334a3c68f Merge topic 'rel-macos-apple-silicon' into release-3.19
56a075eb5d ci: update macOS package to produce universal binaries
b184cc256b ci: do not use sccache for macOS packaging
41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages
b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5595
2020-12-10 12:05:16 -05:00
Brad King 56a075eb5d ci: update macOS package to produce universal binaries
Update our deployment target to macOS 10.10.
This is required by Qt 5.9.

Fixes: #21565
Issue: #20825
2020-12-10 10:55:17 -05:00
Brad King b184cc256b ci: do not use sccache for macOS packaging
It is not compatible with building for multiple architectures.
2020-12-10 10:53:59 -05:00
Brad King 41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages 2020-12-10 10:09:29 -05:00
Brad King b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries
These may be used to build a CMake universal binary for macOS that supports
both architectures on Apple Silicon and is compatible with OS X 10.10.
2020-12-10 10:03:52 -05:00
Brad King 9109475bfb Merge topic 'cpp23'
9f3c70a333 CUDA, CXX, OBJCXX: C++23 support with Clang 12
af7e1545c8 CUDA, CXX: Remove HAS_FULL_SUPPORT for C++17 and 20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5576
2020-12-10 07:00:17 -05:00
Brad King 0a2bb18719 Merge topic 'cmake.el'
54b409094d cmake-mode.el: Improve help display with reStructuredText mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jostein Kjønigsen <jostein@kjonigsen.net>
Merge-request: !5575
2020-12-10 06:59:32 -05:00
Brad King 86157e219d Merge topic 'EML-Support'
d6df83a690 Find{BLAS,LAPACK}: Add support for Elbrus Math Library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5590
2020-12-10 06:58:51 -05:00
Brad King ff7f4e0b53 Merge branch 'release-3.19' 2020-12-10 06:57:54 -05:00
Brad King 419adf0eef Merge topic 'test-macos-version'
55193c8013 ci: Hard-code XCTest deployment target to 10.15
40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3
c404d7f221 Tests: Add cache entry to control XCTest deployment target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5593
2020-12-10 06:57:54 -05:00
Brad King 020e1e2031 Merge topic 'test-macos-version' into release-3.19
55193c8013 ci: Hard-code XCTest deployment target to 10.15
40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3
c404d7f221 Tests: Add cache entry to control XCTest deployment target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5593
2020-12-10 06:57:53 -05:00
Brad King ea77dbcaf8 Merge branch 'release-3.19' 2020-12-10 06:57:04 -05:00
Brad King 9f66eb74a5 Merge topic 'ispc-system-includes' into release-3.19
8da25e4a3c ISPC: Treat system includes as '-I' includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5591
2020-12-10 06:57:04 -05:00
Brad King e966c23be2 Merge topic 'ispc-system-includes'
8da25e4a3c ISPC: Treat system includes as '-I' includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5591
2020-12-10 06:57:04 -05:00
Asit Dhal e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios
1.  COMMAND_ERROR_IS_FATAL ANY will capture errors if the exit code is
    non zero, there is a timeout or an abnormal exit.

2.  COMMAND_ERROR_IS_FATAL LAST
    will capture if only the last process has an exit code non zero, there
    is a timeout or an abnormal exit.

Fixes: #21562
2020-12-10 06:09:59 -05:00
Kitware Robot 7d4a6ce714 CMake Nightly Date Stamp 2020-12-10 00:01:09 -05:00
Brad King 55193c8013 ci: Hard-code XCTest deployment target to 10.15
Avoid using the macOS version running on the CI job host that happens
to run the build job.
2020-12-09 13:28:52 -05:00
Brad King 40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3 2020-12-09 13:10:44 -05:00
Brad King c404d7f221 Tests: Add cache entry to control XCTest deployment target 2020-12-09 13:10:17 -05:00
Robert Maynard 8da25e4a3c ISPC: Treat system includes as '-I' includes
ISPC doesn't have specific syntax for system includes.
2020-12-09 11:33:44 -05:00
Brad King 3c68404c20 Merge topic 'xcode-ios-empty-sticker-pack'
0a60d1b6b4 Allow empty source file list for iOS Sticker packs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5587
2020-12-09 09:16:34 -05:00
Brad King 2236e910b6 Merge topic 'gen-vs-intel-dpcpp-compiler-support'
7808cbd644 CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5579
2020-12-09 09:15:49 -05:00
Brad King a2f98803f0 Merge topic 'android-docs'
1a4b1cca1c Android: update documentation for NDK integration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5586
2020-12-09 09:15:13 -05:00
Brad King acc9c89914 Merge topic 'cmp0116-automoc'
1080935732 AutoGen: Account for CMP0116 in the depfile
287c591079 cmake -E: Fix cmake_transform_depfile escaping of transformed paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5584
2020-12-09 09:14:00 -05:00
Igor S. Gerasimov d6df83a690 Find{BLAS,LAPACK}: Add support for Elbrus Math Library
http://mossigplan.acm.org/EML_introduction_engl.pdf
2020-12-09 16:49:41 +03:00
Kitware Robot d5b12ddcbc CMake Nightly Date Stamp 2020-12-09 00:01:14 -05:00
Kyle Edwards 1080935732 AutoGen: Account for CMP0116 in the depfile
Fixes: #21467
2020-12-08 14:51:36 -05:00
Brad King 287c591079 cmake -E: Fix cmake_transform_depfile escaping of transformed paths
In commit b2c14bc774 (cmake -E: Add cmake_transform_depfile internal
command, 2020-10-02) we forgot to use `WriteFilenameGcc` in one place.
2020-12-08 14:51:36 -05:00
condy 54b409094d cmake-mode.el: Improve help display with reStructuredText mode
Many of the `cmake --help-*` options print `.rst` source documents
with only partial evaluation.  View them in the Emacs `rst-mode`.
2020-12-09 01:21:38 +08:00
Raul Tambre 9f3c70a333 CUDA, CXX, OBJCXX: C++23 support with Clang 12
Clang 12 landed initial support for C++23 language mode flag -std={c|gnu}++2b
in commit 6627a3c2873fdf7ccba1a1573371079be48b36e8.
2020-12-08 18:43:59 +02:00