mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,448 Commits 2 Branches 401 Tags
1dd9c4ab6fa9ced2276433dbce081d9cff838d1e
Commit Graph

53448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 1dd9c4ab6f cmNinjaTargetGenerator: Clarify GetScanBuildStatement condition 
Use the `compilePP` variable directly rather than relying on callers
to make `compilePP == !ppFileName.empty()`.
 2021-06-14 15:11:20 -04:00
Brad King d94b23885a cmNinjaTargetGenerator: Simplify scan rule response file selection 
Since commit 33a8e0bb09 (cmNinjaTargetGenerator: Simplify scan rule
depfile selection, 2020-11-06, v3.20.0-rc1~516^2~1), the `$out` of the
scan rule always matches our `.rsp` file selection, so use `$out.rsp`.
 2021-06-14 15:06:34 -04:00
Brad King 0d3ddb1704 Merge branch 'release-3.20' 2021-06-14 11:59:23 -04:00
Brad King b61fe6a831 CMake 3.20.4 v3.20.4 2021-06-14 11:05:49 -04:00
Brad King 6b218d2e26 Merge topic 'objc-std-17-23' 
e8dc95ae1e ObjectiveC: Add C17 and C23 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6219
 2021-06-14 09:49:22 -04:00
Brad King 13b40c1ea2 Merge topic 'FindBLAS-LAPACK-docs' 
5bf1651452 Find{BLAS,LAPACK}: Revise and extend Intel MKL usage documentation
8585a12bd9 Find{BLAS,LAPACK}: Move enabled language requirement to top of documentation
6a7c055f96 Find{BLAS,LAPACK}: Revise formatting of intro docs
43b581367d Find{BLAS,LAPACK}: Move implementation note from docs to comments
3beac78a13 Find{BLAS,LAPACK}: Revise imported targets documentation layout
6f305cd5fd Find{BLAS,LAPACK}: Factor out vendor documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6218
 2021-06-14 09:48:37 -04:00
Brad King 6022795474 Merge topic 'FindBLAS-oneAPI-mkl' 
130fa72bb3 Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6210
 2021-06-14 09:47:31 -04:00
Brad King f245a20ad0 Merge topic 'xcode13-linker-output' 
a7bbbbf73b Tests: ignore Xcode DVTPlugInManager output
8dcdd4351f Tests: recognize Xcode 13 linker warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6216
 2021-06-14 09:45:44 -04:00
Brad King a7ad3a5f92 Merge topic 'help-cmake_path-IS_PREFIX' into release-3.20 
e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6223
 2021-06-14 09:44:14 -04:00
Brad King 06dc53fc40 Merge branch 'release-3.20' 2021-06-14 09:44:14 -04:00
Brad King cad0a203c9 Merge topic 'help-cmake_path-IS_PREFIX' 
b06887b48c Merge branch 'backport-3.20-help-cmake_path-IS_PREFIX' into help-cmake_path-IS_PREFIX
4665d1e69a Help: cmake_path: fix erroneous example for IS_PREFIX
e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6223
 2021-06-14 09:44:14 -04:00
Brad King 2e533bf924 Merge branch 'release-3.20' 2021-06-14 09:41:51 -04:00
Brad King 43c42e12c8 Merge topic 'fileapi-link-fragments' into release-3.20 
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6220
 2021-06-14 09:41:50 -04:00
Brad King 6fa9f3c695 Merge topic 'fileapi-link-fragments' 
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6220
 2021-06-14 09:41:50 -04:00
Kitware Robot 6230be4975 CMake Nightly Date Stamp 2021-06-14 00:01:14 -04:00
Kitware Robot d0ddef5812 CMake Nightly Date Stamp 2021-06-13 00:01:06 -04:00
Marc Chevrier b06887b48c Merge branch 'backport-3.20-help-cmake_path-IS_PREFIX' into help-cmake_path-IS_PREFIX 2021-06-12 11:24:14 +02:00
Marc Chevrier 4665d1e69a Help: cmake_path: fix erroneous example for IS_PREFIX 
Fixes: #22302
 2021-06-12 11:23:47 +02:00
Marc Chevrier e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX 2021-06-12 11:22:40 +02:00
Kitware Robot 8a4f3fd861 CMake Nightly Date Stamp 2021-06-12 00:01:11 -04:00
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