Commit Graph

48506 Commits

Author SHA1 Message Date
Brad King
019ff154b9 Merge topic 'vs-add_package_reference_install' into release-3.18
3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4854
2020-06-08 08:03:04 -04:00
Brad King
45ecea430b Merge topic 'cuda_cudart_status' into release-3.18
7e2f86461a FindCUDAToolkit: Fix cudart not found status message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4861
2020-06-08 07:57:52 -04:00
Raul Tambre
7e2f86461a FindCUDAToolkit: Fix cudart not found status message
This ended up after the searching after commit dc2eae1 (FindCUDAToolkit: Factor
out discovery code into a separate file, 2020-04-22).
Move it back to where it was and should be.
2020-06-08 07:56:31 -04:00
Brad King
6f8a31849c Merge topic 'cuda_clang_simulate' into release-3.18
0f88b7a592 CUDA: Fix Clang depfile flags when simulating MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4863
2020-06-08 07:55:51 -04:00
Raul Tambre
0f88b7a592 CUDA: Fix Clang depfile flags when simulating MSVC
__compiler_clang() doesn't call __compiler_gnu() if we're emulating MSVC. Thus
CMAKE_DEPFILE_FLAGS_CUDA remains unset and compiling doesn't work, due to NVCC
dependency injection workaround in CMakeCUDAInformation.cmake, which triggers
for Ninja if they're not set.
Always set the depfile flags to fix this. Most other compiler modules seem to
do the same.
2020-06-08 07:54:51 -04:00
Brad King
8325683420 Merge topic 'cuda_user_architectures_specifiers' into release-3.18
4eaf1ef425 CUDA: Fix checking working architectures with specifiers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4856
2020-06-08 07:53:26 -04:00
Brad King
01069f9a10 Merge topic 'cuda-arch-cmp0104' into release-3.18
5bf9a290e7 CUDA: Fix CUDA_ARCHITECTURES policy CMP0104 check in try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4857
2020-06-05 11:01:15 -04:00
Brad King
5bf9a290e7 CUDA: Fix CUDA_ARCHITECTURES policy CMP0104 check in try_compile
Since commit e98588aaba (CUDA: Add CUDA_ARCHITECTURES target property,
2020-03-12), `CMAKE_CUDA_ARCHITECTURES` is both initialized and required
by policy CMP0104's `NEW` behavior.  Inside a `try_compile` project we
use `cmake_minimum_required(VERSION ...)` with the current running
version of CMake.  Now that our version number is 3.18, `CMP0104` gets
set to `NEW` in the `try_compile`.  If the outer projects does not set
the policy then `CMAKE_CUDA_ARCHITECTURES` is not available and the
`try_compile` fails to generate.

Teach `try_compile` to check the outer project's policy status and
set policy CMP0104 to `OLD` if needed to match.

Fixes: #20794
2020-06-05 10:09:33 -04:00
Brad King
7934352e44 Begin 3.18 release versioning 2020-06-05 08:33:59 -04:00
Brad King
47a47f5ce0 Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2020-06-05 08:33:59 -04:00
Brad King
7cf278da55 Merge topic 'doc-3.18-relnotes'
389ca18289 Help: Organize and revise 3.18 release notes
ab6b5c01ea Help: Consolidate 3.18 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4845
2020-06-05 08:22:18 -04:00
Raul Tambre
4eaf1ef425 CUDA: Fix checking working architectures with specifiers
We don't distinguish real/virtual architectures during compiler detection.
If the user passes -DCMAKE_CUDA_ARCHITECTURES="70-virtual" we'll test with only
the real architecture.
If it works "architectures" will end up as "70". We check equality using
strings, so this fails and we incorrectly throw an error.
Fix this by comparing against CMAKE_CUDA_ARCHITECTURES with the specifiers
stripped.

We need to deduplicate tested_architectures for the same reason in case the
user specified something like "70-real;70-virtual".
2020-06-05 15:04:23 +03:00
Kinan Mahdi
3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types
This makes them compatible with `VS_PACKAGE_REFERENCES` and, in
particular, fixes nuget package references in combination with install
targets.

Fixes: #20764
2020-06-05 08:01:59 -04:00
Brad King
3414ee155e Merge topic 'reduce-try_compile'
9f3923893c libarchive: Map fixed-size integer types from KWIML as typedefs
d20bf471c8 liblzma: Map fixed-size integer types from KWIML as typedefs
92c4316d81 KWSys: Hard-code try_compile results on Windows
2bc89f1a03 cmSystemTools: Hard-code try_compile results for Windows
d350d4668a libarchive: Hard-code try_compile results for bundled dependencies
bf60ac24ae Source: Assume elf.h does not exist on Windows
f408cc2c40 expat: Remove unused try_compile checks
6c4f3dcd7b Utilities: Update hard-coded try_compile results for third-party libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4848
2020-06-05 07:58:38 -04:00
Brad King
6aa8746810 Merge topic 'msbuild-utf8-enable'
e219527a72 VS: Use StdOutEncoding for VS 16.7 Preview 3 and above
8a7ad923a8 VS: Extract instance version from VS Installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4847
2020-06-05 07:57:46 -04:00
Brad King
c3c41a9308 Merge topic 'armclang-mcpu/armlink--cpu_options'
ef816610be ARMClang: allow fallback to -march and correct setting of --cpu flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4850
2020-06-05 07:57:06 -04:00
Brad King
efac04465c Merge topic 'cuda_clang_separable_error'
b1243201e7 CUDA: Don't RunCMake generate separable compilation tests on Clang
1b4c690543 CUDA: Throw error if CUDA_SEPARABLE_COMPILATION is ON when using Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4827
2020-06-05 07:56:19 -04:00
Kitware Robot
4af0458630 CMake Nightly Date Stamp 2020-06-05 00:01:10 -04:00
Kitware Robot
d0a44e0458 CMake Nightly Date Stamp 2020-06-04 00:01:13 -04:00
Brad King
cc746c5b7e Merge topic 'linux-release-builders'
922cd3affe ci: fix the project detection for CDash submissions
c5b072800d gitlab-ci: add jobs for reproducing the release binaries
45f2786ff7 Release/linux: remove explicit LANG setting
c540fcaa6b Sphinx/create_identifiers: handle qhp contents as utf-8
e237fc65b7 Sphinx/create_identifiers: use `not in` not `not _ in`
0aa061f6f8 Sphinx/create_identifiers: remove unused import

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4852
2020-06-03 15:20:05 -04:00
Brad King
005269a03f Merge topic 'gitlab-ci-msvc-14.26'
f65ba96043 gitlab-ci: Update Windows builds to MSVC 19.26

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4851
2020-06-03 14:10:50 -04:00
Ben Boeckel
922cd3affe ci: fix the project detection for CDash submissions 2020-06-03 13:02:16 -04:00
Ben Boeckel
c5b072800d gitlab-ci: add jobs for reproducing the release binaries 2020-06-03 12:50:15 -04:00
Brad King
f65ba96043 gitlab-ci: Update Windows builds to MSVC 19.26 2020-06-03 12:22:30 -04:00
Brad King
420a75fc3f Merge topic 'gitlab-ci-concurrent-jobs'
cbe80818e2 gitlab-ci: support Windows jobs which support concurrent builds
d3e02f1a48 gitlab-ci: support macOS jobs which support concurrent builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4849
2020-06-03 11:59:19 -04:00
Brad King
9f3923893c libarchive: Map fixed-size integer types from KWIML as typedefs
Refactoring in commit ade3b16e63 (libarchive: Use KWIML to get
fixed-size integer types, 2020-06-01) accidentally changed the method of
defining `int#_t` types from `typedef` to `#define`.  Change it back to
`typedef`.

Reported-by: Rolf Eike Beer <eike@sf-mail.de>
2020-06-03 11:54:37 -04:00
Brad King
d20bf471c8 liblzma: Map fixed-size integer types from KWIML as typedefs
Refactoring in commit 12e7bfcbf4 (liblzma: Use KWIML to get fixed-size
integer types, 2020-05-25) accidentally changed the method of defining
`int#_t` types from `typedef` to `#define`.  Change it back to
`typedef`.

Reported-by: Rolf Eike Beer <eike@sf-mail.de>
2020-06-03 11:54:13 -04:00
Ben Boeckel
45f2786ff7 Release/linux: remove explicit LANG setting
It shouldn't be needed anymore now that the Sphinx scripts are reading
UTF-8 content explicitly.
2020-06-03 11:51:21 -04:00
Ben Boeckel
c540fcaa6b Sphinx/create_identifiers: handle qhp contents as utf-8 2020-06-03 11:51:21 -04:00
Ben Boeckel
e237fc65b7 Sphinx/create_identifiers: use not in not not _ in 2020-06-03 11:40:47 -04:00
Ben Boeckel
0aa061f6f8 Sphinx/create_identifiers: remove unused import 2020-06-03 11:40:47 -04:00
Osama Moharam
ef816610be ARMClang: allow fallback to -march and correct setting of --cpu flags
allows cmake to fall back to CMAKE_SYSTEM_ARCH in case CMAKE_SYSTEM_PROCESSOR is not in armclang -mcpu=list
additionally checks if CMAKE_SYSTEM_PROCESSOR belongs to armlink --cpu=list

Fixes: #19962
2020-06-03 16:58:31 +02:00
Ben Boeckel
cbe80818e2 gitlab-ci: support Windows jobs which support concurrent builds 2020-06-03 10:24:02 -04:00
Ben Boeckel
d3e02f1a48 gitlab-ci: support macOS jobs which support concurrent builds 2020-06-03 10:23:45 -04:00
Justin Goshi
e219527a72 VS: Use StdOutEncoding for VS 16.7 Preview 3 and above
VS 16.6 added a `StdOutEncoding` setting for custom commands to tell
MSBuild that the output is encoded as UTF-8.  In commit bc877a7e94 (Add
support to indicate UTF-8 custom command pipe output encoding,
2020-04-08) CMake learned to add the setting in anticipation of the VS
16.6 release.  However, when 16.6 was released it had a bug in the
implementation of custom tasks with StdOutEncoding enabled that was
exposed by our test suite.  In commit 5058fb5401 (VS: Drop
StdOutEncoding with VS 16.6 pending investigation, 2020-05-29) we
disabled the setting pending investigation.

The problem is fixed in VS 16.7 Preview 3, so restore use of the
setting when a VS instance of at least that version is detected.

Fixes: #20769
2020-06-03 09:00:41 -04:00
Justin Goshi
8a7ad923a8 VS: Extract instance version from VS Installer 2020-06-03 08:58:29 -04:00
Brad King
92c4316d81 KWSys: Hard-code try_compile results on Windows
Several of KWSys's checks have the same result on all Windows
platforms supported when building CMake.
2020-06-03 07:55:16 -04:00
Brad King
2bc89f1a03 cmSystemTools: Hard-code try_compile results for Windows
All Windows platforms offer `environ` in `stdlib.h` and do
not have `unsetenv`.
2020-06-03 07:48:52 -04:00
Brad King
d350d4668a libarchive: Hard-code try_compile results for bundled dependencies 2020-06-03 07:48:52 -04:00
Brad King
bf60ac24ae Source: Assume elf.h does not exist on Windows 2020-06-03 07:48:52 -04:00
Brad King
f408cc2c40 expat: Remove unused try_compile checks 2020-06-03 07:48:52 -04:00
Brad King
6c4f3dcd7b Utilities: Update hard-coded try_compile results for third-party libraries
The integer size checks have been replaced with KWIML so their
hard-coded results are no longer needed.

Tell `TEST_BIG_ENDIAN` to use `unsigned short` as the 16-bit integer.

UNIX device APIs do not exist on Windows.

FreeBSD libmd does not exist on Windows.

Fix typo in existing `HAVE_READPASSPHRASE_H` setting.
2020-06-03 07:48:52 -04:00
Brad King
35a192788f Merge topic 'doc-EXCLUDE_FROM_ALL'
e262123fee Help: Clarify the effect of EXCLUDE_FROM_ALL on target installation
a09195e7bf Help: Rename 'artefact' to 'artifact' in target_precompile_headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4840
2020-06-03 07:48:13 -04:00
Brad King
389ca18289 Help: Organize and revise 3.18 release notes
Add section headers similar to the 3.18 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2020-06-03 06:22:15 -04:00
Brad King
ab6b5c01ea Help: Consolidate 3.18 release notes
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.18.rst`.
2020-06-03 06:17:54 -04:00
Brad King
85a9f056a1 Merge topic 'imported-local-target-alias'
056489d567 add_library/add_executable: allow local alias to imported targets
254f2b9058 Help: add_executable: Add TOC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4837
2020-06-03 06:12:31 -04:00
Brad King
007109b20f Merge topic 'armclang-armlink'
73fb6ac82b ARMClang: Add support for armlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4811
2020-06-03 06:10:14 -04:00
Brad King
42e6e29654 Merge topic 'cpack-archive-zip-timestamps'
c339e5380f CPack: Use SOURCE_DATE_EPOCH for all timestamps in archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4842
2020-06-03 06:07:16 -04:00
Brad King
44aab71ee1 Merge branch 'release-3.17' 2020-06-03 06:04:39 -04:00
Brad King
84f846d6fb Merge topic 'pch-no-Fortran'
e76c11aa7c Merge branch 'backport-3.17-pch-no-Fortran' into pch-no-Fortran
10c88c4337 PCH: Do not enable GNU or Intel PCH settings for Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4843
2020-06-03 06:04:39 -04:00