summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ExternalProject: omit --no-checkout from git clone when using git 2.20.x.Nate Avers2020-07-241-1/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'xcode-12-legacy-deprecation' into release-3.18Brad King2020-07-271-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Xcode: Suppress legacy build system deprecation warningBrad King2020-07-231-0/+2
| |/ / / / / / / /
* | | | | | | | | Merge topic 'FindXalanC-1.12' into release-3.18Brad King2020-07-271-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FindXalanC: Fix version parsing for XalanC 1.12Brad King2020-07-241-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge topic 'vs-lang-flags' into release-3.18Brad King2020-07-274-0/+29
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | VS: Restore toleration of target-wide -TP flag with MSVCBrad King2020-07-234-0/+29
| |/ / / / / / /
* | | | | | | | Merge topic 'file-GET_RUNTIME_DEPENDENCIES-terms' into release-3.18Brad King2020-07-231-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option namesBrad King2020-07-231-2/+2
| |/ / / / / / /
* | | | | | | | Merge topic 'cmake-gui-qt-5.14' into release-3.18Brad King2020-07-231-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | cmake-gui: Fix crash when built with Qt 5.14 or laterBrad King2020-07-221-2/+3
| |/ / / / / / /
* | | | | | | | Merge topic 'aux-install-dest' into release-3.18Brad King2020-07-222-8/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Auxiliary: Add options to control Vim and Emacs file installationBrad King2020-07-212-8/+25
| |/ / / / / / /
* | | | | | | | Merge topic 'graphviz-restore-per-target' into release-3.18Brad King2020-07-225-7/+201
|\ \ \ \ \ \ \ \