mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 01:51:02 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,080 Commits 2 Branches 390 Tags
20182f60cf782b6136eedc3cd4edba7c6465e68f
Commit Graph

52080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
20182f60cf Merge topic 'ci-test-ext-done' into release-3.20 
7829136a6f gitlab-ci: Tell CDash when a test-ext job is done

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5971
 2021-04-02 10:23:58 -04:00
Brad King
0ed8a3cc7b Merge topic 'doc-IMPORTED_LOCATION' into release-3.20 
08a25e4902 Help: Clarify IMPORTED_LOCATION documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5968
 2021-04-02 07:54:36 -04:00
Brad King
daba4a0250 Merge topic 'FindMPI-host_link' into release-3.20 
666f689e48 FindMPI: avoid host link options to be propagated to device link step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !5966
 2021-04-02 07:53:41 -04:00
Brad King
7829136a6f gitlab-ci: Tell CDash when a test-ext job is done 
These jobs are self-contained and so can be re-run on their own to
produce a whole new submission to CDash.  Tell CDash when each
submission is done so re-running a job replaces results rather than
accumulating them.
 2021-04-02 06:57:21 -04:00
mcc
08a25e4902 Help: Clarify IMPORTED_LOCATION documentation 
Prefer the macOS term "application bundle" over just "bundle".
Put both macOS cases together.
 2021-04-01 13:40:44 -04:00
Brad King
8fb7a124cb Merge branch 'release-3.19' into release-3.20 2021-04-01 10:24:15 -04:00
Brad King
78ff963f74 Merge topic 'doc-CMAKE_APPLE_SILICON_PROCESSOR' into release-3.20 
3f04f69733 Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5965
 2021-04-01 10:23:13 -04:00
Marc Chevrier
666f689e48 FindMPI: avoid host link options to be propagated to device link step 
Fixes: #21887
 2021-04-01 16:23:08 +02:00
Brad King
049757b8a8 Merge topic 'genex-HOST_LINK-in-try_compile' into release-3.20 
6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5964
 2021-04-01 10:22:15 -04:00
Brad King
fca5aa8b33 Merge topic 'CUDA-device-link' into release-3.20 
bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5962
 2021-04-01 10:21:11 -04:00
Brad King
369d5c2bcf Merge topic 'make-fix-deps-paths' into release-3.20 
1b346350af Makefiles dependencies: normalize windows paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5955
 2021-04-01 10:19:58 -04:00
Brad King
1806d95e92 Merge branch 'doc-CMAKE_APPLE_SILICON_PROCESSOR' into release-3.19 
Merge-request: !5965
 2021-04-01 10:05:40 -04:00
Brad King
3f04f69733 Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain file 
`CMakeDetermineSystem` determines the host system information before
loading the toolchain file.

Issue: #22012
 2021-04-01 10:04:05 -04:00
Marc Chevrier
6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile 
Fixes: #22007
 2021-03-31 19:03:35 +02:00
Brad King
36f1f7c449 Merge topic 'cray-version-patch' into release-3.20 
258faaeef6 Cray: Detect Fortran compiler version patch level if available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5957
 2021-03-31 09:32:57 -04:00
Justin LaPolla
258faaeef6 Cray: Detect Fortran compiler version patch level if available 
Fixes: #21969
 2021-03-31 09:30:48 -04:00
Brad King
375e14a405 Merge topic 'android-binutils' into release-3.20 
61e6fc26bc Android: Fix search for binutils

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5958
 2021-03-31 09:26:35 -04:00
Marc Chevrier
bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted 
Fixes: #21994
 2021-03-31 12:05:23 +02:00
Haibo Huang
61e6fc26bc Android: Fix search for binutils 
Set `CMAKE_SYSTEM_PROGRAM_PATH` in `Platform/Android-Initialize` instead
of `Platform/Android` so it can be used in `CMakeFindBinUtils`.

Also add the names `llvm-strip` and `llvm-ranlib` for the corresponding
tools.
 2021-03-30 10:06:02 -04:00
Brad King
c0092247fe Merge topic 'ninja-automoc-cycle' into release-3.20 
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
 2021-03-30 09:54:09 -04:00
Brad King
16b4d5fc84 Merge topic 'GNUInstallDirs-doc' into release-3.20 
06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5947
 2021-03-30 09:52:07 -04:00
Brad King
1df75b171d Merge topic 'nmc-cc-no-output' into release-3.20 
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5950
 2021-03-30 09:50:48 -04:00
Marc Chevrier
1b346350af Makefiles dependencies: normalize windows paths 
Fixes: #21997
 2021-03-30 15:04:03 +02:00
Kyle Edwards
ca7c76269b Tests: Add test for Ninja automoc dependency cyle 2021-03-29 15:17:11 -04:00
Kyle Edwards
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile 
SKIP_AUTOMOC files should not be included in moc processing, which
means they shouldn't be included in the depfile either. Remove them.

Fixes: #21977
 2021-03-29 15:17:11 -04:00
Brad King
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output 
With generator expressions in a custom command's `OUTPUT` and
`BYPRODUCTS`, it is possible to have no outputs at all for a particular
configuration.  Generate no rule in this case.

Fixes: #21989
 2021-03-29 09:56:43 -04:00
Brad King
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output 
Ninja versions prior to 1.6.0 occasionally print this message.
 2021-03-29 09:55:57 -04:00
Brad King
06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute 
Fixes: #21991
 2021-03-29 09:45:27 -04:00
Brad King
d212d91f14 Merge topic 'commands-file-permissions' into release-3.20 
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
 2021-03-29 09:32:09 -04:00
Brad King
99dd2a6e15 Merge topic 'FindIntl-builtin' into release-3.20 
e34d64c04d FindIntl: Fix detection of intl built in to C library
cb0d1a49e6 FindIntl: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jeremy Tan <jtanx@outlook.com>
Acked-by: David Adam <zanchey@ucc.gu.uwa.edu.au>
Merge-request: !5948
 2021-03-29 09:31:02 -04:00
Brad King
0e37e0d215 Merge topic 'correct_arg_parsing' into release-3.20 
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
 2021-03-29 09:29:39 -04:00
Craig Scott
769ff05483 Help: Clarify permission-related command options 
The previous docs did not make clear that at most only one of the three
permissions-related options can be given for configure_file() or
file(GENERATE) and that USE_SOURCE_PERMISSIONS is already the
default behavior for these commands.

Use consistent wording to refer to the input and output files for
configure_file().

Add missing "versionadded" directives on some of these keywords.

Use the consistent wording and keyword ordering between the
configure_file(), file(GENERATE) and file(COPY) commands.
 2021-03-27 09:54:27 +11:00
Brad King
e34d64c04d FindIntl: Fix detection of intl built in to C library 
Since commit c30d06b7e6 (FindIntl: Add imported target, 2020-10-06,
v3.20.0-rc1~687^2) we use `check_symbol_exists` to check whether the
`intl` library is built in to the C library.  On some platforms the
tested symbols are provided as macros so the check passes without
linking any symbol.  Instead, check whether a sample source file both
compiles and links.

Fixes: #21979
 2021-03-26 11:01:34 -04:00
Sibi Siddharthan
cb0d1a49e6 FindIntl: Improve documentation formatting 
Backport from commit a9b11a06f5 (FindIntl: Add version support, 2021-02-23).
 2021-03-26 10:38:53 -04:00
Robert Maynard
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index 
Fixes #21966

Correctly compute the next parse index for `ZeroOrOne` when
it is zero, and for OneOrMore.
 2021-03-26 09:34:46 -04:00
Brad King
2a2afe0ae4 Merge topic 'ninja-multi-long-custom-command' into release-3.20 
3b864b2583 Ninja Multi-Config: Include configs in long CC scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5941
 2021-03-26 09:23:19 -04:00
Craig Scott
900184616a Cleanup: Fix misspelt name of local C++ variable 2021-03-26 22:17:57 +11:00
Craig Scott
635431a0c9 Tests: Check host platform instead of target for running stat 2021-03-26 22:17:57 +11:00
Craig Scott
4ceb0ca59e Tests: Remove redundant files for configure_file() tests 2021-03-26 22:17:57 +11:00
Kyle Edwards
3b864b2583 Ninja Multi-Config: Include configs in long CC scripts 
Fixes: #21973
 2021-03-25 13:18:47 -04:00
Brad King
fef28dbc1e Merge topic 'doc-custom-output-genex' into release-3.20 
2f59b683d3 Help: Custom OUTPUT and BYPRODUCTS genexes cannot refer to targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5939
 2021-03-25 10:24:37 -04:00
Brad King
3e4e02dcc5 Merge topic 'nsis-branding-trim-position' into release-3.20 
a6a5256395 CPack: Validate and document NSIS branding text trim positions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5928
 2021-03-25 10:23:24 -04:00
Craig Scott
2f59b683d3 Help: Custom OUTPUT and BYPRODUCTS genexes cannot refer to targets 
Relates: #21364
 2021-03-25 18:04:17 +11:00
Brad King
fb91e21e46 Merge branch 'release-3.19' into release-3.20 2021-03-24 16:45:13 -04:00
Brad King
52b77060c8 Merge topic 'ci-msvc-14.28-16.9' into release-3.20 
472a11c3d2 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9
3a042bef8e gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5935
 2021-03-24 16:44:02 -04:00
Brad King
0913499f69 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into release-3.19 
Merge-request: !5935
 2021-03-24 10:22:29 -04:00
Brad King
472a11c3d2 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9 2021-03-24 10:20:35 -04:00
Brad King
3a042bef8e gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolset 2021-03-24 10:18:30 -04:00
Craig Scott
a6a5256395 CPack: Validate and document NSIS branding text trim positions 2021-03-24 16:35:29 +11:00
Brad King
b7b0fb4303 CMake 3.20.0 v3.20.0 2021-03-23 11:43:17 -04:00