Commit Graph

51544 Commits

Author SHA1 Message Date
Kitware Robot
902f0c59fd CMake Nightly Date Stamp 2021-01-25 00:01:30 -05:00
Craig Scott
72974fe339 Merge topic 'doc-xcode-attr'
3c80666f00 Help: Document intended purpose of XCODE_ATTRIBUTE_<an-attribute>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5726
2021-01-24 03:26:35 -05:00
Kitware Robot
1bfe5102b2 CMake Nightly Date Stamp 2021-01-24 00:01:08 -05:00
Kitware Robot
0bfb0edc8e CMake Nightly Date Stamp 2021-01-23 00:01:12 -05:00
Brad King
3c80666f00 Help: Document intended purpose of XCODE_ATTRIBUTE_<an-attribute>
Also warn the reader against setting values CMake normally generates.

Issue: #21728
2021-01-23 07:29:10 +11:00
Brad King
6bd251ace7 Merge topic 'SWIG-dependencies'
89b01b04fa UseSWIG: use swig tool to generate dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5724
2021-01-22 08:39:09 -05:00
Brad King
5a1b257fe7 Merge topic 'msvc-arm64ec-platform-support'
4ea3a88625 MSVC: Add support for targeting ARM64EC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5708
2021-01-22 08:38:21 -05:00
Kitware Robot
664038ab4f CMake Nightly Date Stamp 2021-01-22 00:01:14 -05:00
Marc Chevrier
89b01b04fa UseSWIG: use swig tool to generate dependencies
add_custom_command() supports option DEPFILE when generator is
Makefiles or Ninja. And swig tool is able to generate a dependencies
file which is compatible with DEPFILE option.
2021-01-21 19:29:04 +01:00
Brad King
e93fb3c9c6 Merge branch 'release-3.18' 2021-01-21 13:05:01 -05:00
Brad King
82cfeeb484 Merge branch 'backport-3.18-ci-wix-download' into release-3.18
Merge-request: !5725
2021-01-21 13:04:24 -05:00
Brad King
9d4190be04 Merge branch 'release-3.19' 2021-01-21 13:01:20 -05:00
Brad King
34e5023682 Merge topic 'ci-wix-download'
127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download
8efbb0c95f ci: download WiX on Windows
5e5fecb7bc ci: speed up cmake and ninja downloads on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5725
2021-01-21 13:01:20 -05:00
Brad King
0df1fd9d43 Merge topic 'ci-wix-download' into release-3.19
127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download
8efbb0c95f ci: download WiX on Windows
5e5fecb7bc ci: speed up cmake and ninja downloads on Windows
6c34835a26 Merge branch 'backport-ninja-no-cleandead' into release-3.18
41ec2a4fac Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18
035a0c497a Merge branch 'cuda_detect_vs_codegen' into release-3.18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5725
2021-01-21 13:01:19 -05:00
Brad King
127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download 2021-01-21 12:20:54 -05:00
Brad King
8efbb0c95f ci: download WiX on Windows
Avoid requiring Windows CI hosts to have WiX installed.
2021-01-21 11:53:11 -05:00
Brad King
5e5fecb7bc ci: speed up cmake and ninja downloads on Windows
Invoke-WebRequest uses a progress bar by default, but we have no
interactive session anyway.  Turn it off to speed up downloads.
2021-01-21 11:49:49 -05:00
Brad King
c69567e56a Merge topic 'FindGit-cache-version'
76fdeb6d13 Tests: FindGit already provides the git version, re-use it
315a200f0c FindGit: Cache the GIT_EXECUTABLE version for the current run

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5712
2021-01-21 09:27:04 -05:00
Brad King
8cdb9de586 Merge topic 'cuda-archs'
92854bf29e CUDA: Update arch selection, restructure for maintainability
a58a572459 CUDA: Add arch selection debug mode to print out CUDA versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5719
2021-01-21 09:19:23 -05:00
Brad King
9d6e6b7d3b Merge topic 'vs-sdk-selection' into release-3.19
1e67482daf VS: Generalize Win10 max SDK version to all VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5721
2021-01-21 09:18:31 -05:00
Brad King
82b5970246 Merge branch 'release-3.19' 2021-01-21 09:18:31 -05:00
Brad King
fddbb7db4b Merge topic 'vs-sdk-selection'
1e67482daf VS: Generalize Win10 max SDK version to all VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5721
2021-01-21 09:18:31 -05:00
Brad King
7838a065a6 Merge topic 'FindHDF5-silence-output' into release-3.19
b924669385 FindHDF5: silence STATUS messages when found with QUIET
2439a048b0 FindHDF5: avoid writing to the output when testing h5cc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5722
2021-01-21 09:17:39 -05:00
Brad King
c70f49d16e Merge branch 'release-3.19' 2021-01-21 09:17:39 -05:00
Brad King
89430f4604 Merge topic 'FindHDF5-silence-output'
b924669385 FindHDF5: silence STATUS messages when found with QUIET
2439a048b0 FindHDF5: avoid writing to the output when testing h5cc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5722
2021-01-21 09:17:39 -05:00
Brad King
15fe8cf8a5 Merge topic 'macos-include-weak-dependencies' into release-3.19
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
f2d92b983b GetPrerequisites: Include weak macOS dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5703
2021-01-21 09:16:37 -05:00
Brad King
7411c850a8 Merge branch 'release-3.19' 2021-01-21 09:16:37 -05:00
Brad King
6bf23b2755 Merge topic 'macos-include-weak-dependencies'
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
f2d92b983b GetPrerequisites: Include weak macOS dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5703
2021-01-21 09:16:37 -05:00
Kitware Robot
d1549824c9 CMake Nightly Date Stamp 2021-01-21 00:01:13 -05:00
Moyo Okeremi 😊
4ea3a88625 MSVC: Add support for targeting ARM64EC 2021-01-20 16:43:35 -08:00
jonathan molinatto
1e67482daf VS: Generalize Win10 max SDK version to all VS generators
The `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` variable added in
CMake 3.19 by commit ba497111f6 (VS: Add option for custom Win10 SDK
version maximum, 2020-08-20, v3.19.0-rc1~262^2) was documented as if it
worked for all generators but implemented only to override CMake's
builtin default for the VS 2015 max SDK version.  Generalize the
variable to set a custom max SDK version for later VS versions too.

Fixes: #21720
2021-01-20 14:46:34 -05:00
Ben Boeckel
b924669385 FindHDF5: silence STATUS messages when found with QUIET 2021-01-20 14:05:14 -05:00
Ben Boeckel
2439a048b0 FindHDF5: avoid writing to the output when testing h5cc
The execution of this tool can output error logs to the output during
configure. This can then be caught by CTest and flagged as an error
during the build.
2021-01-20 14:04:25 -05:00
Henry Schreiner
92854bf29e CUDA: Update arch selection, restructure for maintainability
Fixes: #21712
2021-01-20 12:28:28 -05:00
Henry Schreiner
a58a572459 CUDA: Add arch selection debug mode to print out CUDA versions 2021-01-20 12:27:54 -05:00
Brad King
063f7127d1 Merge topic 'ninja-custom_command-depfile'
b5c2163293 Ninja: add_custom_command(DEPFILE): Ensure dependencies consistency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5710
2021-01-20 11:23:13 -05:00
Bianca van Schaik
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
Starting with Clang 12, `otool -l` reports `LC_LOAD_WEAK_DYLIB` instead
of `LC_LOAD_DYLIB` for weakly linked libraries.  Update the
implementation of `file(GET_RUNTIME_DEPENDENCIES)` to recognize these.

Fixes: #21684
2021-01-20 10:26:54 -05:00
Bianca van Schaik
f2d92b983b GetPrerequisites: Include weak macOS dependencies
Starting with Clang 12, `otool -L` adds `, weak` to weakly linked
libraries.  Update GetPrerequisites to recognize these.

Issue: #21684
2021-01-20 10:26:54 -05:00
Brad King
8809a742be Merge topic 'export-copy-if-different'
51acae534a install(EXPORT): Set copy-if-different on install export config files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5717
2021-01-20 10:22:32 -05:00
Brad King
4c6d433116 Merge topic 'doc-genex'
c2dc7e0f53 Help: Convert genex documentation to sphinx domain objects
778321beb4 Help: Remove extra blank line from cmake-generator-expressions(7)
7d498d6b43 Utilities/Sphinx: Add role and directive for 'genex' in CMake domain
cc1f53351c Help/dev: Mention 'cpack_gen' domain object in CMake Documentation Guide
954a9e9893 Help/dev: Mention 'envvar' domain object in CMake Documentation Guide
621ba5e1f2 cmRST: Add support for 'envvar' directive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5715
2021-01-20 10:18:04 -05:00
Kitware Robot
4c28f27777 CMake Nightly Date Stamp 2021-01-20 00:01:12 -05:00
Craig Scott
76fdeb6d13 Tests: FindGit already provides the git version, re-use it 2021-01-20 10:16:21 +11:00
Craig Scott
315a200f0c FindGit: Cache the GIT_EXECUTABLE version for the current run
The git version should not change while CMake is running. When
using FetchContent with many dependencies, the repeated calls
to get the git version every time ExternalProject is used can be
measurable on some platforms. This commit queries that version
only once and then caches it in a global property for the rest of that
run. The git version can still safely change between runs because it
is not cached, only the GIT_EXECUTABLE location is cached.

Relates: #21703
2021-01-20 10:16:21 +11:00
Daan De Meyer
51acae534a install(EXPORT): Set copy-if-different on install export config files
Avoid reinstalling the per-config export install files if the
contents didn't change after a configure.
2021-01-19 09:59:19 -05:00
Brad King
fab301bb9d Merge topic 'bootstrap-compiler-check-ldflags'
147ba659c1 bootstrap: add cmake_ld_flags to compilers check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5711
2021-01-19 09:07:57 -05:00
Brad King
85af079ab1 Merge branch 'release-3.19' 2021-01-19 09:06:53 -05:00
Brad King
180666f586 Merge topic 'CMake-cross-compiling'
6cee4c6a8b Restore support for cross-compiling CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5713
2021-01-19 09:06:53 -05:00
Brad King
2c0e4c3762 Merge topic 'CMake-cross-compiling' into release-3.19
6cee4c6a8b Restore support for cross-compiling CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5713
2021-01-19 09:06:52 -05:00
Marc Chevrier
b5c2163293 Ninja: add_custom_command(DEPFILE): Ensure dependencies consistency
Fixes: #21694
2021-01-19 13:17:14 +01:00
Kitware Robot
2740cc458b CMake Nightly Date Stamp 2021-01-19 00:01:12 -05:00