summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clang: Look for llvm-lib when using MSVC-like front-endShoaib Meenai2020-09-241-1/+2
* CMake 3.18.3v3.18.3Brad King2020-09-221-1/+1
* Merge topic 'check-compiler-flag-result' into release-3.18Brad King2020-09-222-2/+0
|\
| * Merge branch 'backport-3.17-check-compiler-flag-result'Brad King2020-09-212-2/+0
| |\ |/ /
| * Check*CompilerFlag: Do not set result as a normal variable tooBrad King2020-09-212-2/+0
* | Merge topic 'foreach-int-parse-range-check' into release-3.18Brad King2020-09-215-0/+15
|\ \
| * | foreach: Fix crash parsing integer out of rangeBen McMorran2020-09-185-0/+15
* | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-186-7/+28
|\ \ \
| * | | Ninja Multi-Config: Fix dependencies of custom commandsKyle Edwards2020-09-176-7/+28
* | | | Merge topic 'FindMatlab-r2020b' into release-3.18Brad King2020-09-181-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | FindMatlab: add R2020b => 9.9Michael Hirsch2020-09-171-0/+1
| |/ /
* | | Merge topic 'ci-xcode-11.7' into release-3.18Brad King2020-09-171-3/+3
|\ \ \ | |/ / |/| |
| * | gitlab-ci: update macOS jobs to use Xcode 11.7Brad King2020-09-171-3/+3
|/ /
* | Help: Update 3.18.2 release notes to mention 3.16.9 and 3.17.5Brad King2020-09-151-0/+1
* | Merge branch 'release-3.17' into release-3.18Brad King2020-09-151-0/+9
|\ \ | |/
| * CMake 3.17.5v3.17.5Brad King2020-09-151-1/+1
| * Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17Brad King2020-09-151-0/+9
| |\
| | * Help: Add 3.17.5 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-0/+9
| | * Merge branch 'backport-3.16-automoc-path-prefix-off'Brad King2020-09-151-5/+11
| | |\
| * | \ Merge branch 'release-3.16' into release-3.17Brad King2020-09-151-5/+11
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'backport-3.17-automoc-depend-project-file' into release-3.17Brad King2020-08-319-1/+150
| |\ \ \
* | \ \ \ Merge branch 'release-3.16' into release-3.18Brad King2020-09-151-5/+11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | CMake 3.16.9v3.16.9Brad King2020-09-151-1/+1
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-09-151-5/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Help: Add 3.16.9 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-5/+11
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-08-104-5/+7
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16Brad King2020-08-071-0/+5
| |\ \ \ \
* | \ \ \ \ Merge topic 'armclang-fixes' into release-3.18Brad King2020-09-111-2/+3
|\ \ \ \ \ \
| * | | | | | ARMClang: Fix link line generation after addition of armlink supportMarc Chevrier2020-09-101-2/+3
* | | | | | | Merge topic 'file-GENERATE-earlier' into release-3.18Brad King2020-09-111-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | file(GENERATE): Create output file structures for all directories firstJosef Angstenberger2020-09-101-0/+2
|/ / / / / /
* | | | | | Merge topic 'gitlab-ci-prefer-mr' into release-3.18Brad King2020-09-101-4/+4
|\ \ \ \ \ \
| * | | | | | gitlab-ci: Prefer MR rules for any pipeline associated with a MRBrad King2020-09-101-4/+4
* | | | | | | Merge topic 'automoc-rerun-missing-dependency' into release-3.18Brad King2020-09-109-7/+132
|\ \ \ \ \ \ \
| * | | | | | | AutoMoc: Re-run moc if a dependency is missingJoerg Bornemann2020-09-099-7/+132
* | | | | | | | Merge topic 'pch-tv90' into release-3.18Brad King2020-09-091-8/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | PCH: Fix 30s wait for VS2008 when used via -Tv90Cristian Adam2020-09-071-8/+20
| |/ / / / / / /
* | | | | | | | Merge topic 'ios-pch-x-lang-header' into release-3.18Brad King2020-09-094-4/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | PCH: Mark CMake PCH source files as -x <lang>-headerCristian Adam2020-09-044-4/+19
| |/ / / / / / /
* | | | | | | | Merge topic 'FindPython-set-CMP0012-NEW' into release-3.18Brad King2020-09-081-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | FindPython: CMP0012 must be set to NEWMarc Chevrier2020-09-071-1/+11
|/ / / / / / /
* | | | | | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-039-5/+39
|\ \ \ \ \ \ \
| * | | | | | | Ninja Multi-Config: Fix dependencies of utility targetsKyle Edwards2020-09-026-2/+32
| * | | | | | | Ninja Multi-Config: Fix cleaning of utility targets with commandsKyle Edwards2020-09-021-0/+2
| * | | | | | | Ninja Multi-Config: Fix clean:all targetKyle Edwards2020-09-021-0/+1
| * | | | | | | Tests: Pass additional Qt information to Ninja and NMC testsKyle Edwards2020-09-013-3/+4
* | | | | | | | Merge topic 'FindPython-include-dir-ABI-checks' into release-3.18Brad King2020-09-031-8/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | FindPython: enhance ABI checks against include directoryMarc Chevrier2020-09-021-8/+18
|/ / / / / / /
* | | | | | | Merge topic 'automoc-depend-project-file' into release-3.18Brad King2020-09-019-1/+150
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-3.17-automoc-depend-project-file'Brad King2020-08-319-1/+150
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |