Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity
53,578 Commits 2 Branches 375 Tags
18038042ed16cfbc7515c42f01652c17f0d65dbc
Commit Graph

53578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths 
Use the same `cmLinkLineComputer` subclass as the generator does.  This
affects the base directory from which relative paths are computed.

Fixes: #22301
 2021-06-11 11:11:36 -04:00
Gregor Jasny
e8dc95ae1e ObjectiveC: Add C17 and C23 support 
Issue: #22297
 2021-06-11 14:47:23 +02:00
Brad King
5bf1651452 Find{BLAS,LAPACK}: Revise and extend Intel MKL usage documentation 
Fixes: #22295
 2021-06-11 08:41:25 -04:00
Brad King
8585a12bd9 Find{BLAS,LAPACK}: Move enabled language requirement to top of documentation 2021-06-11 08:40:37 -04:00
Brad King
6a7c055f96 Find{BLAS,LAPACK}: Revise formatting of intro docs 2021-06-11 08:02:59 -04:00
Brad King
43b581367d Find{BLAS,LAPACK}: Move implementation note from docs to comments 2021-06-11 08:00:22 -04:00
Brad King
3beac78a13 Find{BLAS,LAPACK}: Revise imported targets documentation layout 2021-06-11 07:58:15 -04:00
Brad King
6f305cd5fd Find{BLAS,LAPACK}: Factor out vendor documentation 
Move the list of vendors to a dedicated section shared by both modules.
Format it as a definition list.
 2021-06-11 07:51:37 -04:00
Peter Knowles
130fa72bb3 Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOT 
Add search paths for the Intel oneAPI MKL directory structure
so that we do not rely on paths in `LD_LIBRARY_PATH`.
 2021-06-11 06:55:09 -04:00
Brad King
cd2944a303 Merge topic 'p1689r4-updates' 
ccc0466fc5 cmScanDepFormat: P1689R4: Implement source-path related fields
3e5b609547 cmScanDepFormat: P1689R4: Make work-directory optional
aab9a5fc3e cmScanDepFormat: P1689R4: Factor out primary-output field
b0a8fa959c cmScanDepFormat: P1689R4: Diagnose invalid provides/requires json type
82c867ad85 cmScanDepFormat: P1689R4: Flatten future-compile members into parent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6202
 2021-06-11 06:15:24 -04:00
Brad King
f597bb396e Merge topic 'dir-IMPORTED_TARGETS' 
e13704ce72 Add directory property to list imported targets
ea6d338ea1 cmState: Record imported target names in each directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6215
 2021-06-11 06:11:42 -04:00
Brad King
15b1d5ab9c Merge topic 'ci-rpm' 
369725faa5 gitlab-ci: add job to run CPack RPM tests
1186ed64d0 ci: add rpm-build to Fedora base image
60380bd77c Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test case
5130ff6878 Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6214
 2021-06-11 06:10:34 -04:00
Brad King
557e47f154 Merge topic 'test-CPackComponentsForAll-errors' 
45935ac973 Tests: Improve CPackComponentsForAll test error formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6212
 2021-06-11 06:08:09 -04:00
Brad King
4217e1cf3a Merge topic 'FindBLAS-mkl-gnu' 
daa0a1f877 Find{BLAS,LAPACK}: Add tests covering Intel MKL with GNU compiler
624110b90d FindBLAS: Revert "Do not statically link against iomp5 ... Intel MKL"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6213
 2021-06-11 06:05:54 -04:00
Kitware Robot
42ca81ce42 CMake Nightly Date Stamp 2021-06-11 00:01:10 -04:00
Gregor Jasny
a7bbbbf73b Tests: ignore Xcode DVTPlugInManager output 2021-06-10 22:50:06 +02:00
Gregor Jasny
8dcdd4351f Tests: recognize Xcode 13 linker warning 
The linker shipped with Xcode 13 changed the architecture
mismatch linker warning into:

```
ld: warning: ignoring file libfoo.a, building for macOS-x86_64 but attempting to link with file built for macOS-i386
```
 2021-06-10 22:24:31 +02:00
Brad King
e13704ce72 Add directory property to list imported targets 
Model the change after commit cbca65826c (Add directory property to list
buildsystem targets, 2016-09-19, v3.7.0-rc1~79^2~1).

Fixes: #22291
 2021-06-10 15:52:12 -04:00
Brad King
ea6d338ea1 cmState: Record imported target names in each directory 
Model the change after commit 089868a244 (cmState: Record buildsystem
target names in each directory, 2016-09-16, v3.7.0-rc1~79^2~3).
 2021-06-10 15:41:18 -04:00
Brad King
369725faa5 gitlab-ci: add job to run CPack RPM tests 
Run tests on Fedora in a path without spaces so the RPM tests activate.
 2021-06-10 14:46:22 -04:00
Brad King
1186ed64d0 ci: add rpm-build to Fedora base image 
This is needed to test the CPack RPM generator.
 2021-06-10 14:44:02 -04:00
Brad King
60380bd77c Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test case 
Since commit c826745f5a (CPack/DEB: Do not crash when asked for debug
symbols when there are none, 2020-10-29, v3.20.0-rc1~461^2) the test
fails because CPackRPM warns about no sources in which to find debug
symbols.  Add expected output for this case.
 2021-06-10 14:44:02 -04:00
Brad King
5130ff6878 Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34 
Update the cross-arch case from commit f174b919d6 (Tests: CpackRPM test
component architecture, 2015-02-19, v3.3.0-rc1~415^2~1) to use
`armv7hl`, which is supported by current RPM versions.

Fixes: #19983
 2021-06-10 14:06:21 -04:00
Brad King
daa0a1f877 Find{BLAS,LAPACK}: Add tests covering Intel MKL with GNU compiler 2021-06-10 13:00:45 -04:00
Brad King
624110b90d FindBLAS: Revert "Do not statically link against iomp5 ... Intel MKL" 
Since commit 20ab504591 (FindBLAS: Do not statically link against iomp5
in the case of Intel MKL, 2021-04-11), we no longer find MKL's BLAS when
using the GNU compiler because FindOpenMP chooses libgomp instead of
libiomp5, and mkl_intel_thread depends on the latter.  Revert the change
for now.  A new approach will be needed to solve the original problem.

Issue: #21811
 2021-06-10 12:39:00 -04:00
Brad King
45935ac973 Tests: Improve CPackComponentsForAll test error formatting 
Format message content for `message(FATAL_ERROR)`.
 2021-06-10 10:53:02 -04:00
Brad King
5fd68d3ef7 Merge topic 'vs-custom-depfile' 
526e2ef71c VS: Add support for add_custom_command DEPFILE
794ad78abb Help: Generalize release note filename for add_custom_command DEPFILE
7291f31254 cmTransformDepfile: Add support for MSBuild AdditionalInputs format
a6de8ec51b cmTransformDepfile: Make directory for transformed depfile automatically

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6206
 2021-06-10 08:23:45 -04:00
Brad King
cf85c6bf85 Merge topic 'ctest_custom_details' 
02f1271bdf ctest: allow test output to override the 'details' field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6204
 2021-06-10 08:20:18 -04:00
Brad King
49c165450f Merge topic 'doc-ctest-interactive-popups' 
cf8710da74 Help: Document ctest(1) --interactive-debug-mode limitation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6211
 2021-06-10 08:19:00 -04:00
Brad King
db168e84fc Merge topic 'doc-CTEST_FULL_OUTPUT' 
46686f077b Help: Document special "CTEST_FULL_OUTPUT" test output string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6209
 2021-06-10 08:17:46 -04:00
Brad King
2bc7a3a1b0 Merge topic 'test-RunCMake.CPack-errors' 
d4056f24a1 Tests: Improve RunCMake.CPack*.SOURCE_PACKAGE test error formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6208
 2021-06-10 08:16:47 -04:00
Ben Boeckel
ccc0466fc5 cmScanDepFormat: P1689R4: Implement source-path related fields 2021-06-10 07:55:20 -04:00
Kitware Robot
2086b938a7 CMake Nightly Date Stamp 2021-06-10 00:01:12 -04:00
Brad King
cf8710da74 Help: Document ctest(1) --interactive-debug-mode limitation 
Fixes: #22287
Issue: #20115
 2021-06-09 14:35:15 -04:00
Ben Boeckel
3e5b609547 cmScanDepFormat: P1689R4: Make work-directory optional 2021-06-09 11:02:25 -04:00
Ben Boeckel
aab9a5fc3e cmScanDepFormat: P1689R4: Factor out primary-output field 2021-06-09 10:51:02 -04:00
Ben Boeckel
b0a8fa959c cmScanDepFormat: P1689R4: Diagnose invalid provides/requires json type 2021-06-09 10:50:56 -04:00
Ben Boeckel
82c867ad85 cmScanDepFormat: P1689R4: Flatten future-compile members into parent 2021-06-09 10:50:41 -04:00
Brad King
526e2ef71c VS: Add support for add_custom_command DEPFILE 
Transform the depfile into MSBuild `AdditionalInputs` content.  Add
MSBuild Targets to update `AdditionalInputs` and the `.tlog` files for
future builds without actually modifying the `.vcxproj` file.

Fixes: #20286
 2021-06-09 10:09:58 -04:00
Brad King
794ad78abb Help: Generalize release note filename for add_custom_command DEPFILE 
Rename the note added by commit d67cc4882d (Xcode: Add support of
DEPFILE for add_custom_command, 2021-04-15) to be more general.
 2021-06-09 10:09:58 -04:00
Brad King
7291f31254 cmTransformDepfile: Add support for MSBuild AdditionalInputs format 2021-06-09 10:09:58 -04:00
Brad King
a6de8ec51b cmTransformDepfile: Make directory for transformed depfile automatically 2021-06-09 10:09:58 -04:00
Zack Galbreath
02f1271bdf ctest: allow test output to override the 'details' field 
Parse test output for <CTestDetails>...</CTestDetails>.
If found, use this value to override the default 'Details' string reported
to CDash.
 2021-06-09 08:31:32 -04:00
Brad King
46686f077b Help: Document special "CTEST_FULL_OUTPUT" test output string 2021-06-09 08:23:06 -04:00
Brad King
d4056f24a1 Tests: Improve RunCMake.CPack*.SOURCE_PACKAGE test error formatting 
Format message content for `message(FATAL_ERROR)`.

Apply the change from commit c54c284de7 (Tests: Improve RunCMake.CPack*
test error formatting, 2021-04-22) to the `SOURCE_PACKAGE` script too.
Also fix a typo from commit f5d79dec53 (Tests: Cleanup CPack message when
files are expected and none are found, 2021-01-15, v3.20.0-rc1~89^2~22).
 2021-06-09 08:15:30 -04:00
Brad King
5e26887c35 Merge topic 'msvc-link-merge-fix' 
a9f992434d VS: Remove the /MERGE flag from FlagTables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6205
 2021-06-09 08:06:07 -04:00
Brad King
fee0619e7c Merge topic 'help-presets' 
b00512e692 Help: presets: add note for ExternalProject users with env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6201
 2021-06-09 08:05:21 -04:00
Brad King
5c18c8a178 Merge topic 'ctest_measurement_file' 
cbcb92d1cb ctest: add support for attaching files to tests at run time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6192
 2021-06-09 08:04:23 -04:00
Brad King
1d225c5c0c Merge topic 'ci-asan' 
20bc209a0c gitlab-ci: add clang asan job
19d831b03d ci: add compiler-rt to Fedora base image
fda060f030 LexerParser: Do not leak Fortran parser tokens discarded due to errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6200
 2021-06-09 08:02:34 -04:00
Brad King
d42933d03b Merge branch 'release-3.20' 2021-06-09 07:57:35 -04:00