summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 topic 'ci-macos-arm64' into release-3.20Brad 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 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD' into release-3.20Brad King2021-02-231-2/+2
|\ \
| * | Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystemsDaan De Meyer2021-02-221-2/+2
* | | Merge topic 'test-macos-arm64' into release-3.20Brad 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 topic 'cmake-gui-restore-search' into release-3.20Brad King2021-02-232-0/+10
|\ \ \ \
| * | | | cmake-gui: Restore search bar for cache view and environment dialogSankhesh Jhaveri2021-02-222-0/+10
| |/ / /
* | | | Merge topic 'nag-fortran-include-moddir' into release-3.20Brad King2021-02-231-0/+1
|\ \ \ \
| * | | | NAG: Fix using Fortran modules from their output directoryBrad King2021-02-221-0/+1
* | | | | Merge topic 'per-config-autogen-info-file' into release-3.20Brad King2021-02-232-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Autogen: Don't change the order of HEADERS array in AutogenInfo.jsonCraig Scott2021-02-222-4/+4
| |/ / /
* | | | Merge topic 'fix-IS_NEWER_THAN-usage' into release-3.20Brad King2021-02-228-6/+111
|\ \ \ \
| * | | | FetchContent: Don't update timestamps if files don't changeCraig Scott2021-02-226-4/+107
| * | | | ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checksCraig Scott2021-02-222-2/+4
* | | | | Merge topic 'vs-pch-one-lang' into release-3.20Brad King2021-02-226-7/+44
|\ \ \ \ \
| * | | | | VS: Restore support for PCH in CXX but not C within once targetBrad King2021-02-196-1/+38
| * | | | | cmVisualStudio10TargetGenerator: Refactor per-source PCH logicBrad King2021-02-191-6/+6
| | |/ / / | |/| | |
* | | | | Merge topic 'cpackifw-scanbuild-fix' into release-3.20Brad King2021-02-221-2/+9
|\ \ \ \ \
| * | | | | CPackIFWInstaller: Avoid potential null pointer dereferenceCraig Scott2021-02-191-2/+9
* | | | | | Merge topic 'doc-cpack-dpkg-shlibdeps-l' into release-3.20Brad King2021-02-221-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentationBrad King2021-02-191-1/+1
* | | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-02-190-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-intel-fortran-preprocess' into release-3.19Brad King2021-02-181-2/+10
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'intel-fortran-preprocess' into release-3.20Brad King2021-02-192-4/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | IntelLLVM: Make explicit Fortran preprocessing under Ninja more robustBrad King2021-02-181-2/+10
| * | | | | | | | Merge branch 'backport-intel-fortran-preprocess'Brad King2021-02-181-2/+10
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Intel: Make explicit Fortran preprocessing under Ninja more robustBrad King2021-02-181-2/+10
| | |/ / / / /
* | | | | | | Merge topic 'docpreset' into release-3.20Brad King2021-02-192-10/+25
|\ \ \ \ \ \ \
| * | | | | | | Help: Add build and test preset to examples in cmake-presets(7)Michael Hirsch2021-02-181-2/+16
| * | | | | | | Help: Clarify preset name conflict rules in cmake-presets(7)Michael Hirsch2021-02-181-8/+9
* | | | | | | | Merge topic 'llvm-nm-cleanup' into release-3.20Brad King2021-02-191-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | bindexplib: remove stray debugging output when using llvm-nmBrad King2021-02-181-1/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'doc-if-links' into release-3.20Brad King2021-02-181-7/+51
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Help: Add internal links to if() docsMichael Hirsch, Ph.D2021-02-181-7/+51
| |/ / / / /
* | | | | | Merge topic 'preset-json-comments' into release-3.20Brad King2021-02-181-1/+4
|\ \ \ \ \ \
| * | | | | | Help: Document JSON comment support in cmake-presets(7)Michael Hirsch2021-02-181-1/+4
* | | | | | | Merge topic 'doc-presets' into release-3.20Brad King2021-02-183-12/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Help: Clarify role of binaryDir inheritance in cmake-presets(7)Brad King2021-02-181-4/+6