summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\
| * Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
| |\
* | \ Merge branch 'release-3.19'Brad King2021-02-240-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'backport-3.19-preset-no-comments' into release-3.19Brad King2021-02-248-7/+25
| |\ \
| * \ \ Merge branch 'ninja-status-stderr' into release-3.19Brad King2021-02-233-0/+12
| |\ \ \
* | \ \ \ Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'preset-no-comments' into release-3.20Brad King2021-02-2410-20/+26
| |\ \ \ \
* | \ \ \ \ Merge topic 'preset-no-comments'Brad King2021-02-2410-20/+26
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'backport-3.19-preset-no-comments' into preset-no-commentsBrad King2021-02-248-7/+25
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | CMakePresets.json: Remove undocumented support for commentsKyle Edwards2021-02-248-7/+25
| * | | | | Tests: Remove comments from CMakePresetsTest/Good.json.inKyle Edwards2021-02-241-9/+0
| * | | | | Revert "Help: Document JSON comment support in cmake-presets(7)"Kyle Edwards2021-02-241-4/+1
* | | | | | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'ninja-status-stderr' into release-3.20Brad King2021-02-243-0/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
* | | | | Merge topic 'ninja-status-stderr'Brad King2021-02-243-0/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Tests: Update for upstream ninja change to write status on stderrBrad King2021-02-233-0/+12
| | |_|/ | |/| |
* | | | CMake Nightly Date StampKitware Robot2021-02-241-1/+1
* | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'ci-macos-arm64' into release-3.20Brad King2021-02-239-89/+146
| |\ \ \
* | \ \ \ Merge topic 'ci-macos-arm64'Brad King2021-02-239-89/+146
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | gitlab-ci: Add macos-arm64 jobs for Ninja and XcodeBrad King2021-02-234-0/+72
| * | | | gitlab-ci: rename macos build and test jobs to macos-x86_64Brad King2021-02-235-32/+32
| * | | | ci: add sccache 0.2.15 custom build for aarch64-apple-darwinBrad King2021-02-231-0/+7
| * | | | ci: update to sccache 0.2.15 on linux buildsBrad King2021-02-231-5/+5
| * | | | ci: Use Qt macOS 10.13+ package for macOS build and test jobsBrad King2021-02-231-52/+30
| |/ / /
* | | | Merge topic 'cpack_nsis_executable_custom'Brad King2021-02-233-1/+15
|\ \ \ \
| * | | | CPack/NSIS: Add option for setting custom makensis executableJohnny Jazeix2021-02-223-1/+15
* | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD' into release-3.20Brad King2021-02-231-2/+2
| |\ \ \ \
* | \ \ \ \ Merge topic 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD'Brad King2021-02-231-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystemsDaan De Meyer2021-02-221-2/+2
* | | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'test-macos-arm64' into release-3.20Brad King2021-02-2311-19/+58
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'test-macos-arm64'Brad King2021-02-2311-19/+58
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Tests: Suppress failures on macOS arm64 due to separate Xcode signing phaseBrad King2021-02-228-0/+47
| * | | | | | Tests: Fix CTestTestCrash expected output on macOS arm64Brad King2021-02-221-1/+1
| * | | | | | Tests: Remove explicit no-signing marks from BundleTestBrad King2021-02-223-14/+6
| * | | | | | Tests: Clarify internal project name in RunCMake.GoogleTest casesBrad King2021-02-224-4/+4
* | | | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cmake-gui-restore-search' into release-3.20Brad King2021-02-232-0/+10
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'cmake-gui-restore-search'Brad King2021-02-232-0/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | cmake-gui: Restore search bar for cache view and environment dialogSankhesh Jhaveri2021-02-222-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'nag-fortran-include-moddir' into release-3.20Brad King2021-02-231-0/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'nag-fortran-include-moddir'Brad King2021-02-231-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | NAG: Fix using Fortran modules from their output directoryBrad King2021-02-221-0/+1
* | | | | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'per-config-autogen-info-file' into release-3.20Brad King2021-02-232-4/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'per-config-autogen-info-file'Brad King2021-02-232-4/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Autogen: Don't change the order of HEADERS array in AutogenInfo.jsonCraig Scott2021-02-222-4/+4
| | |/ / / / / | |/| | | | |
generated by cgit v0.12 at 2025-09-07 12:16:48 (GMT)