summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| |/
* | Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17Brad 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 branch 'ninja-multi-rsp-remove-path' into release-3.17Brad King2020-08-031-10/+2
|\ \ \ | |/ / |/| |
| * | Ninja: Restore shorter path to response filesKyle Edwards2020-08-031-10/+2
|/ /
* | CMake 3.17.4v3.17.4Brad King2020-07-301-1/+1
* | Merge branch 'bootstrap-intel' into release-3.17Brad King2020-07-241-1/+1
|\ \
| * | bootstrap: Fix support for Intel compiler with modern GNU system compilerBrad King2020-07-241-1/+1
* | | Merge branch 'backport-3.17-graphviz-restore-per-target' into release-3.17Brad King2020-07-215-7/+201
|\ \ \
| * | | Tests: Cover Graphviz support for per-target dependency graph optionsStephan Rohmen2020-07-213-0/+56
| * | | Graphviz: Restore support for per-target dependency graph optionsStephan Rohmen2020-07-212-7/+145
| |/ /
* | | Merge branch 'ninja-multi-rsp' into release-3.17Brad King2020-07-161-4/+14
|\ \ \
| * | | Ninja Multi-Config: Make link response files per-configKyle Edwards2020-07-161-4/+14
| |/ /
* | | Merge branch 'FindOpenSSL-3.0' into release-3.17Brad King2020-06-081-2/+4
|\ \ \
| * | | FindOpenSSL: Fix OpenSSL 3.0.0 version extractionBilly Brumley2020-06-081-2/+4
| |/ /
* | | Merge topic 'pch-no-Fortran' into release-3.17Brad King2020-06-032-11/+15
|\ \ \
| * | | PCH: Do not enable GNU or Intel PCH settings for FortranBrad King2020-06-022-11/+15
| |/ /
* | | Merge topic 'vs-sln-version-16' into release-3.17Brad King2020-06-031-1/+1
|\ \ \
| * | | VS: Fix .sln support for VS Version Selector with VS 2019Brad King2020-06-021-1/+1
| |/ /
* | | Merge branch 'release-3.16' into release-3.17Brad King2020-06-010-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.16.8v3.16.8Brad King2020-06-011-1/+1
| * | Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache' into release-3.16Brad King2020-05-293-5/+22
| |\ \
* | \ \ Merge topic 'pch-fix-bad-ClearSourcesCache' into release-3.17Brad King2020-06-013-5/+22
|\ \ \ \
| * \ \ \ Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache'Brad King2020-05-293-5/+22
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | PCH: Fix logic error that incorrectly clears sources during VS generationBrad King2020-05-293-5/+22
* | | | Merge topic 'ninja-multi-export-all-symbols' into release-3.17Brad King2020-06-012-1/+4
|\ \ \ \
| * | | | Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLSKyle Edwards2020-05-292-1/+4
|/ / / /
* | | | Merge topic 'FindSubversion-xcode-removed' into release-3.17Brad King2020-05-291-2/+11
|\ \ \ \ | |/ / / |/| | |
| * | | FindSubversion: Do not accept macOS stub without Xcode implementationBrad King2020-05-281-2/+11
|/ / /
* | | CMake 3.17.3v3.17.3Brad King2020-05-281-1/+1
* | | Merge topic 'openssl-3.0.0' into release-3.17Brad King2020-05-281-0/+9
|\ \ \
| * | | FindOpenSSL: Detect OpenSSL 3.0.0Vitezslav Cizek2020-05-271-0/+9
* | | | Merge topic 'fix-cpack-deb-generating-empty-paragraph' into release-3.17Brad King2020-05-283-12/+12
|\ \ \ \
| * | | | CPack-deb: don't add a line with a dot to pkg descJonathan Verner2020-05-273-12/+12
|/ / / /
* | | | Merge topic 'ctest-repeat-notrun' into release-3.17Brad King2020-05-276-6/+54
|\ \ \ \
| * | | | CTest: Make sure NOT_RUN tests show up in the failed test logRobert Maynard2020-05-276-1/+33
| * | | | Tests: Add coverage of ctest_test RETURN_VALUE and REPEATRobert Maynard2020-05-271-5/+21
| |/ / /
* | | | Merge branch 'release-3.16' into release-3.17Brad King2020-05-270-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | CMake 3.16.7v3.16.7Brad King2020-05-271-1/+1
| * | | Merge branch 'vs-sln-version' into release-3.16Brad King2020-05-191-0/+1
| |\ \ \
| * \ \ \ Merge branch 'fix-ClearSourcesCache' into release-3.16Brad King2020-05-151-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16Brad King2020-05-151-0/+6
| |\ \ \ \
* | \ \ \ \ Merge topic 'doc-updates' into release-3.17Brad King2020-05-252-7/+9
|\ \ \ \ \ \
| * | | | | | Help: clarify add_definitions() and add_compile_definitions() behaviorMarc Chevrier2020-05-242-7/+9
* | | | | | | Merge topic 'ninja-multi-install' into release-3.17Brad King2020-05-256-6/+117
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Ninja Multi-Config: Make "install" targets depend on default configsKyle Edwards2020-05-226-6/+117