mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 13:51:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,780 Commits 2 Branches 385 Tags
cb6889a09c8cd538a0856942e429fddc78dbd24e
Commit Graph

3466 Commits

Author SHA1 Message Date
Brad King
5a8b37e53b Merge topic 'autogen-clear-early-source-cache' 
b84f1e6159 Autogen: Restore mocs_compilation in OBJECT libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6024
 2021-04-21 10:42:17 -04:00
Brad King
b84f1e6159 Autogen: Restore mocs_compilation in OBJECT libraries 
Since commit f65f20938c (Autogen: Avoid processing CSharp targets,
2020-11-12, v3.20.0-rc1~301^2) we collect all sources for a target
earlier than previously.  Clear the sources cache so that it will be
re-computed later after AUTOGEN processing.

Fixes: #22085
 2021-04-20 16:04:08 -04:00
Brad King
4c0d69e813 Merge topic 'Xcode-add_custom_command-DEPFILE' 
253aff6c94 Xcode: Add support of DEPFILE for add_custom_command, part 2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6015
 2021-04-20 09:59:53 -04:00
Brad King
5ac713da70 Merge topic 'mrjoel/add-missing-not' 
370bebd921 Add missing 'not' in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6012
 2021-04-19 09:44:03 -04:00
Marc Chevrier
253aff6c94 Xcode: Add support of DEPFILE for add_custom_command, part 2 
This MR extend the support of 'DEPFILE' to buildsystem version 1.

Issue: #20286
 2021-04-17 11:05:26 +02:00
Brad King
acace43852 Merge topic 'Xcode-add_custom_command-DEPFILE' 
d67cc4882d Xcode: Add support of DEPFILE for add_custom_command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6006
 2021-04-16 11:42:23 -04:00
Brad King
bb290fc7a4 Merge topic 'add_toolchain_cmake_option' 
d5c3e4ac32 cmake: add support for --toolchain command argument
13838bbb36 CMAKE_TOOLCHAIN_FILE: Document relative path behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5991
 2021-04-16 11:39:28 -04:00
Joel Johnson
370bebd921 Add missing 'not' in error messages 2021-04-16 07:47:59 -06:00
Marc Chevrier
d67cc4882d Xcode: Add support of DEPFILE for add_custom_command 
Issue: #20286
 2021-04-15 12:17:31 -04:00
Robert Maynard
d5c3e4ac32 cmake: add support for --toolchain command argument 2021-04-15 10:13:49 -04:00
Marc Chevrier
0c47b91fcc Genex: add_custom_command: DEPFILE supports genex 
This facility is very useful for 'Ninja Multi-Config' and required
as well for future support of DEPFILE in 'Xcode' and 'Visual Studio'
generators (#20286).
 2021-04-12 13:06:49 +02:00
Brad King
21f0478ade Merge topic 'presets-optional-generator-and-builddir' 
06e6981336 cmake-presets: Make generator and binaryDir fields optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5946
 2021-04-08 07:49:56 -04:00
Brad King
a0e5998bd6 Merge topic 'ctest-wait-verbosity' 
82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode
80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5990
 2021-04-08 07:49:05 -04:00
Brad King
f39ea2e292 Merge topic 'flags-with-backslash' 
3953dfcb31 Restore support for backslashes in initial language-wide flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5995
 2021-04-08 07:47:09 -04:00
Brad King
3953dfcb31 Restore support for backslashes in initial language-wide flags 
Refactoring in commit bdc40742bd (CMakeDetermineCompilerId: Test without
COMPILER_ID_FLAGS if REQUIRE_SUCCESS, 2021-02-27, v3.20.0-rc3~6^2) added
an extra macro layer through which flag strings are passed.  That caused
an extra level of argument re-parsing, and broke flags with backslashes.
Pass flags to the helper macro through variable names instead.

Fixes: #22041
 2021-04-07 13:53:22 -04:00
friendlyanon
06e6981336 cmake-presets: Make generator and binaryDir fields optional 
In v3 of the presets, generator and buildDir can be omitted to fall
back to regular cmake behavior when these values are not explicitly
provided by the user.

Fixes: #21987
 2021-04-07 01:24:44 +02:00
Brad King
82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode 
These messages are incidental scheduling output.  Avoid cluttering
the normal verbose output showing tests starting and finishing.
 2021-04-06 14:48:14 -04:00
Brad King
80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag 2021-04-06 12:42:41 -04:00
Brad King
2d7e20dbbd Merge topic 'rel-file-table' 
e17006c497 Utilities/Release: Add deprecation fields to File Table v1
89ab613248 Utilities/Release: Update file table for 3.20.0
c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table
f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table
30959aec8f Utilities/Release: Update file table for 3.19.3
d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table
004dbbaddd Utilities/Release: Update file table for 3.19.2
1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5961
 2021-04-06 08:44:54 -04:00
Brad King
2e029ec598 Merge topic 'rel-file-table' into release-3.20 
e17006c497 Utilities/Release: Add deprecation fields to File Table v1
89ab613248 Utilities/Release: Update file table for 3.20.0
c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table
f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table
30959aec8f Utilities/Release: Update file table for 3.19.3
d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table
004dbbaddd Utilities/Release: Update file table for 3.19.2
1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5961
 2021-04-06 08:44:53 -04:00
Brad King
e061a201b6 Merge topic 'nvhpc-lib-arch' into release-3.20 
764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths
5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5984
 2021-04-06 08:32:34 -04:00
Brad King
ebc812a8d1 Merge topic 'nvhpc-lib-arch' 
764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths
5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5984
 2021-04-06 08:32:34 -04:00
Robert Maynard
764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths 
The NVHPC compiler does not have any implicit link directories that can
be used to detect `CMAKE_LIBRARY_ARCHITECTURE`, but it does have
implicit object files.  Extract implicit object file paths from link
lines and check them for the `CMAKE_LIBRARY_ARCHITECTURE` pattern.

Issue: #22024
 2021-04-05 17:41:10 -04:00
Robert Maynard
5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths" 
The change in commit 657fc3a9a7 (CMakeDetermineCompilerABI: Parse
library arch from versioned paths, 2021-02-03, v3.20.0-rc1~40^2) caused
`CMAKE_LIBRARY_ARCHITECTURE` to be populated on non-multiarch platforms
if their compilers happen to use `$arch/$version` library directories.
Revert the use of versioned library paths.

Fixes: #22024
 2021-04-05 16:40:43 -04:00
Brad King
89ab613248 Utilities/Release: Update file table for 3.20.0 2021-04-05 13:47:02 -04:00
Brad King
c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table 2021-04-05 13:46:35 -04:00
Brad King
f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table 2021-04-05 13:45:08 -04:00
Brad King
30959aec8f Utilities/Release: Update file table for 3.19.3 2021-04-05 13:45:00 -04:00
Brad King
d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table 2021-04-05 13:44:49 -04:00
Brad King
004dbbaddd Utilities/Release: Update file table for 3.19.2 2021-04-05 13:44:42 -04:00
Brad King
1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table 2021-04-05 13:44:36 -04:00
Brad King
383bfbe76f Merge branch 'backport-3.18-rel-file-table' into backport-3.19-rel-file-table 2021-04-05 13:44:27 -04:00
Brad King
0237eba318 Utilities/Release: Add script to generate a table of files 
Fixes: #22002
 2021-04-05 13:43:51 -04:00
Domen Vrankar
34c8a23044 CPackRPM: add scriplets tags only if scripts exist 
Scriplet tags should not be added to generated
spec files if scripts weren't provided as those
tags are otherwise present in generated rpm file
even if the script wasn't provided thereby
generating unneeded dependency on shell.

Fixes: #21345
 2021-04-01 22:28:24 +02:00
Brad King
0fee2adf8c Merge topic 'fujitsu-compiler-4.0-support' 
8ef55dec29 Help: Add release notes for Fujitsu compiler support
4c74c86f40 FindBLAS/LAPACK: Add support for the Fujitsu SSL2 library
376c300b25 FindOpenMP: Add support for Fujitsu compilers
9e0a1cf03e FindMPI: Add support for the Fujitsu compiler wrappers
a237450948 Tests: Update for the FujitsuClang compiler
27579e9cf1 FujitsuClang: Add support for the Fujitsu compiler in Clang mode
a55feff69c Tests: Update for the Fujitsu compiler
3c867cff4a Fujitsu: Add support for the Fujitsu compiler in Trad mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Acked-by: Gilles Gouaillardet <gilles@rist.or.jp>
Merge-request: !5954
 2021-04-01 10:26:54 -04:00
Brad King
1c399ca88c Merge topic 'cmake-presets-condition-regex' 
5ac8b923f5 CMakePresets.json: Add matches condition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5963
 2021-04-01 10:26:12 -04:00
Brad King
ac79fd8a0e Merge topic 'cpackrpm-debuginfo-single-package-install-erase-scripts' 
31c184ad69 CPackRPM: handle scripts in debuginfo single package mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5953
 2021-04-01 10:25:28 -04: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
6068e54dbd Merge topic 'genex-HOST_LINK-in-try_compile' 
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
b362c0bb26 Merge topic 'CUDA-device-link' 
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
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
fc9c1d83bf Tests: Add RunCMake helper to run a plain script 
Many tests covering CMake scripting commands can work without
initializing a full generator.
 2021-03-31 12:00:09 -04:00
Kyle Edwards
5ac8b923f5 CMakePresets.json: Add matches condition 2021-03-31 10:24:24 -04:00
Brad King
45fae18f7b Merge topic 'cpackrpm-single-package-handling-empty-dir' 
d0adb2386a CPackRPM: correctly handle empty dir in single package mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5951
 2021-03-31 09:30:02 -04:00
Yuichiro Utsumi
a237450948 Tests: Update for the FujitsuClang compiler 2021-03-31 09:14:45 -04:00
Chuck Atkins
a55feff69c Tests: Update for the Fujitsu compiler 2021-03-31 09:14:38 -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
Domen Vrankar
31c184ad69 CPackRPM: handle scripts in debuginfo single package mode 
Enabling CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE while
using rpm install or erase scripts resulted in
resulted missing scripts for non default components.

Fixes: #21974
 2021-03-30 23:24:16 +02:00
Brad King
e6a5799fa0 Merge topic 'multiple-L-labels' 
44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lars Bilke <larsbilke83@googlemail.com>
Merge-request: !5329
 2021-03-30 09:55:42 -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