summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampHEADmasterKitware Robot2023-05-181-1/+1
|
* Merge topic 'ci-clang-tidy-headers'Brad King2023-05-175-41/+4
|\ | | | | | | | | | | | | | | | | f24c6ae5b8 ci: Add nlohmann-json to Fedora base image 30e4be0d1b ci: Use distro packaged clang-tidy headers in Fedora base image Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !8488
| * ci: Add nlohmann-json to Fedora base imageBrad King2023-05-172-1/+2
| | | | | | | | | | We need version 3.11.2 or higher, which Debian 10 does not package, so leave it out of the Debian base images.
| * ci: Use distro packaged clang-tidy headers in Fedora base imageBrad King2023-05-174-40/+2
| | | | | | | | | | | | Since commit 703f39354e (ci: add clang-tidy development headers to Fedora base image, 2022-08-31, v3.25.0-rc1~215^2), Fedora has added the `clang-tools-extra-devel` package.
* | Merge topic 'ci-msvc-14.36'Brad King2023-05-171-11/+11
|\ \ | | | | | | | | | | | | | | | | | | 888a9c49ff gitlab-ci: Update Windows builds to MSVC 14.36 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8484
| * | gitlab-ci: Update Windows builds to MSVC 14.36 toolsetBrad King2023-05-161-11/+11
| | |
* | | Merge topic 'ci-xcode-14.3'Brad King2023-05-171-6/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 735a1590a2 gitlab-ci: update macOS jobs to use Xcode 14.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8482
| * | gitlab-ci: update macOS jobs to use Xcode 14.3Brad King2023-05-161-6/+6
| |/
* | CMake Nightly Date StampKitware Robot2023-05-171-1/+1
|/
* Merge topic 'test-xcode'Brad King2023-05-1634-311/+340
|\ | | | | | | | | | | | | a4d114e8cd Tests: Split some RunCMake.XcodeProject cases into a separate test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8478
| * Tests: Split some RunCMake.XcodeProject cases into a separate testBrad King2023-05-1534-311/+340
| | | | | | | | | | | | The `RunCMake.XcodeProject` has many cases and occasionally fails due to timeout. Move iOS and other device-specific cases to a new `RunCMake.XcodeProject-Device` test.
* | Merge topic 'iar-align-output-extension'Brad King2023-05-163-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | cfec4c1c5e IAR: Enforce output extension for xlink targets 7fec8f993b IAR: Replace extension for compiler and assembler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8477
| * | IAR: Enforce output extension for xlink targetsJoakim Lönnberg2023-05-122-2/+7
| | |
| * | IAR: Replace extension for compiler and assemblerJoakim Lönnberg2023-05-081-0/+1
| | |
* | | Merge topic 'help-system-framework'Brad King2023-05-163-12/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 99f8505fda Help: Update SYSTEM oriented target properties for Apple Frameworks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8475
| * | | Help: Update SYSTEM oriented target properties for Apple FrameworksMarc Chevrier2023-05-143-12/+19
| | | | | | | | | | | | | | | | This is a complement to !8469.
* | | | Merge branch 'release-3.26'Brad King2023-05-160-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'msvc-wine-showIncludes' into release-3.26releaseBrad King2023-05-166-1/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb3c4715cd Ninja: Restore detection of msvc-wine showIncludes prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: huangqinjin <huangqinjin@gmail.com> Merge-request: !8479
* | \ \ \ \ Merge topic 'msvc-wine-showIncludes'Brad King2023-05-166-1/+17
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb3c4715cd Ninja: Restore detection of msvc-wine showIncludes prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: huangqinjin <huangqinjin@gmail.com> Merge-request: !8479
| * | | | | Ninja: Restore detection of msvc-wine showIncludes prefixBrad King2023-05-156-1/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8f82e755f3 (Ninja: Fix detection of MSVC showIncludes prefix in Italian, 2023-01-26, v3.26.0-rc1~20^2) our regex no longer matches the output from `msvc-wine`, which uses forward slashes: Note: including file: /path/to/foo.h `cl /showIncludes` under Wine prints paths of the form `Z:\path\to\file`, but the `msvc-wine` wrapper converts them to the form `/path/to/file` so that native Ninja can be used. Update our regex to match the prefix followed by a path with a leading forward slash. Fixes: #24908
* | | | | CMake Nightly Date StampKitware Robot2023-05-161-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2023-05-151-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2023-05-141-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2023-05-131-1/+1
| | |
* | | Merge topic 'system-framework'Brad King2023-05-127-41/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad9020a899 Apple Frameworks: honor SYSTEM target property Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8469
| * | | Apple Frameworks: honor SYSTEM target propertyMarc Chevrier2023-05-117-41/+84
| | | | | | | | | | | | | | | | Fixes: #24109
* | | | CMake Nightly Date StampKitware Robot2023-05-121-1/+1
| | | |
* | | | Merge topic 'ExternalProject-touch-echo'Brad King2023-05-111-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bf0830e44 ExternalProject: Avoid adding empty touch command on "ALWAYS" steps Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !8468
| * | | | ExternalProject: Avoid adding empty touch command on "ALWAYS" stepsAntonio Caggiano2023-05-101-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The problem fixed by commit c0b749cf62 (ExternalProject: Always add a command to a step, 2014-11-05, v3.2.0-rc1~402^2~3) may occur for an empty `COMMAND ${touch}` too, so avoid specifying any `COMMAND` at all if there is no touch command.
* | | | Merge topic 'ci-macos-archs'Brad King2023-05-1120-41/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a20a5f149 gitlab-ci: Move macOS+Xcode universal binaries job to arm64 5210b98ec2 gitlab-ci: Move macOS Ninja Multi-Config nightly job to arm64 architecture 3a9b8ef047 Tests: Teach ISPC tests to run on macOS arm64 host 6aae34ec53 Tests: Fix RunCMake.XcodeProject XcodeSchemaGeneration case on arm64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8470
| * | | | gitlab-ci: Move macOS+Xcode universal binaries job to arm64Brad King2023-05-105-8/+8
| | | | | | | | | | | | | | | | | | | | Over time we are adding `arm64` hosts and removing `x86_64` hosts.
| * | | | gitlab-ci: Move macOS Ninja Multi-Config nightly job to arm64 architectureBrad King2023-05-104-7/+7
| | | | |
| * | | | Tests: Teach ISPC tests to run on macOS arm64 hostBrad King2023-05-1012-25/+71
| | | | |
| * | | | Tests: Fix RunCMake.XcodeProject XcodeSchemaGeneration case on arm64Brad King2023-05-102-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Explicitly specify the xcodebuild scheme destination architecture to match the host.
* | | | | CMake Nightly Date StampKitware Robot2023-05-111-1/+1
|/ / / /
* | | | Merge topic 'ci-macos-archs'Brad King2023-05-101-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03af1c52d6 gitlab-ci: Move some macOS merge request jobs to arm64 hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8465
| * | | | gitlab-ci: Move some macOS merge request jobs to arm64 hostsBrad King2023-05-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Over time we are adding `arm64` hosts and removing `x86_64` hosts. Switch to using `arm64` for some of the more common jobs.
* | | | | Merge topic 'ci-macos-package'Brad King2023-05-102-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7eeca582ed gitlab-ci: Move macOS packaging jobs to arm64 hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8464
| * | | | | gitlab-ci: Move macOS packaging jobs to arm64 hostsBrad King2023-05-092-11/+11
| |/ / / / | | | | | | | | | | | | | | | Over time we are adding `arm64` hosts and removing `x86_64` hosts.
* | | | | Merge topic 'ci-ispc'Brad King2023-05-102-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44d13f50a2 ci: Update to ISPC 1.20.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8466
| * | | | | ci: Update to ISPC 1.20.0Brad King2023-05-092-6/+11
| |/ / / /
* | | | | Merge topic 'dankm/tcsuffix'Brad King2023-05-104-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a82852dc2 Allow toolchain suffix without leading dash Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8462
| * | | | | Allow toolchain suffix without leading dashDan McGregor2023-05-084-2/+7
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeBSD installs both LLVM and gcc with tools named after the major version, in the form "clang<major>", such as "clang16". Detect compilers named this way, and find the related toolchain tools.
* | | | | Merge topic 'ninja-fortran-include'Brad King2023-05-1014-89/+156
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f1894af1f Ninja: Fix Fortran INCLUDE directive dependencies when not preprocessing 9075ebda60 Ninja: Rename internal Fortran scanner flag from --pp= to --src= 266634bce5 Fortran: Teach lexer to recognize LLVMFlang preprocessor dependencies efadf839be Tests: Teach RunCMake to ignore LLVMFlang -flang-experimental-exec warning c78be340ba Tests: Teach RunCMake to ignore Intel Fortran remark 10440 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8461
| * | | | Ninja: Fix Fortran INCLUDE directive dependencies when not preprocessingBrad King2023-05-0911-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b0a6161190 (Fortran: Add Fortran_PREPROCESS property, 2020-04-24, v3.18.0-rc1~116^2~3), if `Fortran_PREPROCESS` is `OFF`, the Ninja generator does not properly detect dependencies on sources loaded via the Fortran INCLUDE directive. Fix this and add a test.
| * | | | Ninja: Rename internal Fortran scanner flag from --pp= to --src=Brad King2023-05-092-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | The value represents the source file to be scanned. It is not always preprocessor output.
| * | | | Fortran: Teach lexer to recognize LLVMFlang preprocessor dependenciesBrad King2023-05-092-69/+74
| | | | | | | | | | | | | | | | | | | | | | | | | The line directives have the form `#line <path> <number>`, and do not have the line number before the path as other compilers do.
| * | | | Tests: Teach RunCMake to ignore LLVMFlang -flang-experimental-exec warningBrad King2023-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is needed for now to tell `flang-new` to support creating executables. In our CI job we always pass this flag, but it is not always used. The compiler may warn: flang-new: warning: argument unused during compilation: '-flang-experimental-exec' Teach RunCMake to drop such incidental lines before matching against expected output.
| * | | | Tests: Teach RunCMake to ignore Intel Fortran remark 10440Brad King2023-05-091-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran compiler may remark: ifx: remark #10440: Note that use of a debug option without any optimization-level option will turnoff most compiler optimizations similar to use of '-O0' Teach RunCMake to drop such incidental lines before matching against expected output. This extends commit b2d030e8fe (Tests: Teach RunCMake to ignore Intel -Rdebug-disables-optimization remarks, 2022-06-14, v3.26.0-rc1~395^2) to cover the `ifx` Fortran compiler too.
* | | | CMake Nightly Date StampKitware Robot2023-05-101-1/+1
| | | |