summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMakeDependentOption: Allow parentheses in the depends stringDaniel Schürmann2021-06-145-1/+16
| | | | | | | `if()` takes the condition as a list of arguments. Parentheses need to be separated as well. Fixes: #22303
* Merge branch 'release-3.20'Brad King2021-06-140-0/+0
|\
| * CMake 3.20.4v3.20.4Brad King2021-06-141-1/+1
| |
* | Merge topic 'objc-std-17-23'Brad King2021-06-146-3/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | e8dc95ae1e ObjectiveC: Add C17 and C23 support Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6219
| * | ObjectiveC: Add C17 and C23 supportGregor Jasny2021-06-116-3/+40
| | | | | | | | | | | | Issue: #22297
* | | Merge topic 'FindBLAS-LAPACK-docs'Brad King2021-06-142-151/+186
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Find{BLAS,LAPACK}: Revise and extend Intel MKL usage documentationBrad King2021-06-112-25/+71
| | | | | | | | | | | | | | | | Fixes: #22295
| * | | Find{BLAS,LAPACK}: Move enabled language requirement to top of documentationBrad King2021-06-112-2/+4
| | | |
| * | | Find{BLAS,LAPACK}: Revise formatting of intro docsBrad King2021-06-112-2/+6
| | | |
| * | | Find{BLAS,LAPACK}: Move implementation note from docs to commentsBrad King2021-06-112-8/+6
| | | |
| * | | Find{BLAS,LAPACK}: Revise imported targets documentation layoutBrad King2021-06-112-7/+6
| | | |
| * | | Find{BLAS,LAPACK}: Factor out vendor documentationBrad King2021-06-112-114/+100
| | | | | | | | | | | | | | | | | | | | Move the list of vendors to a dedicated section shared by both modules. Format it as a definition list.
* | | | Merge topic 'FindBLAS-oneAPI-mkl'Brad King2021-06-142-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 130fa72bb3 Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6210
| * | | | Find{BLAS,LAPACK}: Update for Intel oneAPI structure under MKLROOTPeter Knowles2021-06-112-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Add search paths for the Intel oneAPI MKL directory structure so that we do not rely on paths in `LD_LIBRARY_PATH`.
* | | | | Merge topic 'xcode13-linker-output'Brad King2021-06-142-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7bbbbf73b Tests: ignore Xcode DVTPlugInManager output 8dcdd4351f Tests: recognize Xcode 13 linker warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6216
| * | | | | Tests: ignore Xcode DVTPlugInManager outputGregor Jasny2021-06-101-0/+1
| | | | | |
| * | | | | Tests: recognize Xcode 13 linker warningGregor Jasny2021-06-101-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | | | Merge branch 'release-3.20'Brad King2021-06-140-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'help-cmake_path-IS_PREFIX' into release-3.20Brad King2021-06-141-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6223
* | \ \ \ \ Merge topic 'help-cmake_path-IS_PREFIX'Brad King2021-06-141-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ Merge branch 'backport-3.20-help-cmake_path-IS_PREFIX' into ↵Marc Chevrier2021-06-120-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | help-cmake_path-IS_PREFIX
| | * | | | | Help: cmake_path: fix erroneous example for IS_PREFIXMarc Chevrier2021-06-121-3/+4
| | | | | | |
| * | | | | | Help: cmake_path: fix erroneous example for IS_PREFIXMarc Chevrier2021-06-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22302
* | | | | | | Merge branch 'release-3.20'Brad King2021-06-140-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'fileapi-link-fragments' into release-3.20Brad King2021-06-141-4/+5
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6220
* | | | | | | Merge topic 'fileapi-link-fragments'Brad King2021-06-141-4/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6220
| * | | | | | fileapi: Fix codemodel-v2 link command fragment relative pathsBrad King2021-06-111-4/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same `cmLinkLineComputer` subclass as the generator does. This affects the base directory from which relative paths are computed. Fixes: #22301
* | | | | | CMake Nightly Date StampKitware Robot2021-06-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-06-131-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2021-06-121-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'p1689r4-updates'Brad King2021-06-113-56/+188
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmScanDepFormat: P1689R4: Implement source-path related fieldsBen Boeckel2021-06-102-3/+114
| | | | |
| * | | | cmScanDepFormat: P1689R4: Make work-directory optionalBen Boeckel2021-06-092-4/+11
| | | | |
| * | | | cmScanDepFormat: P1689R4: Factor out primary-output fieldBen Boeckel2021-06-093-9/+18
| | | | |
| * | | | cmScanDepFormat: P1689R4: Diagnose invalid provides/requires json typeBen Boeckel2021-06-091-30/+40
| | | | |
| * | | | cmScanDepFormat: P1689R4: Flatten future-compile members into parentBen Boeckel2021-06-092-54/+49
| | | | |
* | | | | Merge topic 'dir-IMPORTED_TARGETS'Brad King2021-06-1112-0/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Add directory property to list imported targetsBrad King2021-06-108-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cmState: Record imported target names in each directoryBrad King2021-06-105-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Model the change after commit 089868a244 (cmState: Record buildsystem target names in each directory, 2016-09-16, v3.7.0-rc1~79^2~3).
* | | | | | Merge topic 'ci-rpm'Brad King2021-06-116-3/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | gitlab-ci: add job to run CPack RPM testsBrad King2021-06-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Run tests on Fedora in a path without spaces so the RPM tests activate.
| * | | | | | ci: add rpm-build to Fedora base imageBrad King2021-06-102-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to test the CPack RPM generator.
| * | | | | | Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test caseBrad King2021-06-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34Brad King2021-06-102-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'test-CPackComponentsForAll-errors'Brad King2021-06-111-3/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45935ac973 Tests: Improve CPackComponentsForAll test error formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6212
| * | | | | Tests: Improve CPackComponentsForAll test error formattingBrad King2021-06-101-3/+12
| |/ / / / | | | | | | | | | | | | | | | Format message content for `message(FATAL_ERROR)`.
* | | | | Merge topic 'FindBLAS-mkl-gnu'Brad King2021-06-114-36/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Find{BLAS,LAPACK}: Add tests covering Intel MKL with GNU compilerBrad King2021-06-103-20/+48
| | | | | |
| * | | | | FindBLAS: Revert "Do not statically link against iomp5 ... Intel MKL"Brad King2021-06-101-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | CMake Nightly Date StampKitware Robot2021-06-111-1/+1
| |/ / / / |/| | | |