summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'backport-3.17-automoc-path-prefix-off'Brad King2020-08-104-5/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'backport-3.16-automoc-path-prefix-off'Brad King2020-08-104-5/+7
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Autogen: Turn off moc path prefix generation by defaultJoerg Bornemann2020-08-104-5/+7
| | * | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17Brad King2020-08-071-0/+5
| | |\ \ \
| | * \ \ \ Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17Brad King2020-08-058-3/+104
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'ninja-multi-rsp-remove-path' into release-3.17Brad King2020-08-031-10/+2
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge topic 'FPHSA-name-mismatches-chained-via-include' into release-3.18Brad King2020-08-107-0/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | FPHSA: detect inclusion between find modulesBen Boeckel2020-08-077-0/+52
* | | | | | | | | Merge topic 'xcode-try_compile-no-sign-backport' into release-3.18Brad King2020-08-101-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Xcode: Explicitly turn off signing in try_compile projectsBrad King2020-08-101-0/+6
* | | | | | | | | | Merge topic 'FindRuby-restore-include-path' into release-3.18Brad King2020-08-101-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindRuby: Restore compatibility variable RUBY_INCLUDE_PATHBrad King2020-08-071-2/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge topic 'FindPython-user-policies' into release-3.18Brad King2020-08-102-9/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | FindPython: ensure user's policies are respectedMarc Chevrier2020-08-072-9/+6
| |/ / / / / / / /
* | | | | | | | | Merge topic 'test-FindPkgConfig-isolate-env' into release-3.18Brad King2020-08-101-0/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'backport-test-FindPkgConfig-isolate-env'Brad King2020-08-070-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'reuse_pch_no_delay' into release-3.18Brad King2020-08-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | PCH: Avoid unnecessary 30s delay on MSBuild Generator with REUSE_FROMCristian Adam2020-08-051-1/+1
| |/ / / / / /
* | | | | | | Merge topic 'support_list_google_test_executor' into release-3.18Brad King2020-08-061-2/+2
|\ \ \ \ \ \ \
| * | | | | | | GoogleTest: Restore support for list arguments in TEST_EXECUTORLaurits Riple2020-08-031-2/+2
| |/ / / / / /
* | | | | | | Merge topic 'automoc_timestamp_deps' into release-3.18Brad King2020-08-068-3/+104
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-3.17-automoc_timestamp_deps'Brad King2020-08-058-3/+104
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | AutoGen: Add test to check for correct AutoMoc dependenciesAlexandru Croitor2020-08-036-0/+56
| | * | | | | AutoGen: Fix over-specified direct dependencies of custom commandAlexandru Croitor2020-08-032-3/+48
| | | |_|/ / | | |/| | |
* | | | | | Merge topic 'ninja-multi-rsp-remove-path' into release-3.18Brad King2020-08-061-10/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Ninja: Restore shorter path to response filesKyle Edwards2020-08-031-10/+2
| |/ / /
* | | | CMake 3.18.1v3.18.1Brad King2020-07-301-1/+1
* | | | Merge branch 'release-3.17' into release-3.18Brad King2020-07-300-0/+0
|\ \ \ \ | |/ / /
| * | | CMake 3.17.4v3.17.4Brad King2020-07-301-1/+1
| * | | Merge branch 'bootstrap-intel' into release-3.17Brad King2020-07-241-1/+1
| |\ \ \
| * \ \ \ Merge branch 'backport-3.17-graphviz-restore-per-target' into release-3.17Brad King2020-07-215-7/+201
| |\ \ \ \
| * \ \ \ \ Merge branch 'ninja-multi-rsp' into release-3.17Brad King2020-07-161-4/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindOpenSSL-3.0' into release-3.17Brad King2020-06-081-2/+4
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'clang-msvc-cxx-std' into release-3.18Brad King2020-07-301-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Clang: Fix fallback compile features when simulating old MSVC versionsBrad King2020-07-291-5/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'unity_no_skip_autogen' into release-3.18Brad King2020-07-305-1/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Unity Builds: Do not set SKIP_AUTOGEN to source filesCristian Adam2020-07-295-1/+23
|/ / / / / / / /
* | | | | | | | Merge topic 'FindCURL-list-index-if' into release-3.18Brad King2020-07-291-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | FindCURL: Fix list index check after searchMike Gelfand2020-07-281-3/+3
|/ / / / / / / /
* | | | | | | | Merge topic 'revert-add_test-special-chars' into release-3.18Brad King2020-07-2859-383/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | add_test: Revert "Allow special characters in test name"Brad King2020-07-2759-383/+22
* | | | | | | | | Merge topic 'sysroot-prefix' into release-3.18Brad King2020-07-281-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Compilers: Ignore -print-sysroot prefix when it is '/'Brad King2020-07-271-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge topic 'fix-dependent-pipelines' into release-3.18Brad King2020-07-271-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitlab-ci: avoid failing dependent stepsBen Boeckel2020-07-271-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge topic 'bootstrap-intel' into release-3.18Brad King2020-07-271-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | bootstrap: Fix support for Intel compiler with modern GNU system compilerBrad King2020-07-241-1/+1
* | | | | | | | | Merge topic 'externalproject-download-git-2.20-fix' into release-3.18Brad King2020-07-271-1/+5
|\ \ \ \ \ \ \ \ \