summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'invalid_alias' into release-3.17Brad King2020-03-101-2/+2
|\
| * cmAlgorithms: Fix -Wnon-c-typedef-for-linkage warningsRaul Tambre2020-03-091-2/+2
* | Merge topic 'ibmi-fix-libuv-build' into release-3.17Brad King2020-03-091-0/+19
|\ \
| * | libuv: Add support for building on IBM i (OS400)Jesse Gorzinski2020-03-061-0/+19
* | | Merge topic 'cmstd-IBM-i' into release-3.17Brad King2020-03-061-1/+1
|\ \ \
| * | | cmstd: Remove -isystem option for IBM i (OS400)ThePrez2020-03-051-1/+1
| |/ /
* | | Merge branch 'release-3.16' into release-3.17Brad King2020-03-060-0/+0
|\ \ \ | |/ /
| * | CMake 3.16.5v3.16.5Brad King2020-03-041-1/+1
| * | Merge branch 'doc-rel-3.16-updates' into release-3.16Brad King2020-03-041-0/+26
| |\ \
* | \ \ Merge topic 'doc-add_custom_command-depends' into release-3.17Brad King2020-03-061-14/+30
|\ \ \ \
| * | | | Help: Clarify add_custom_command DEPENDS conversion to file pathsBrad King2020-03-061-14/+30
| | |_|/ | |/| |
* | | | Merge topic 'ninja-multi-custom-command-deps' into release-3.17Brad King2020-03-054-7/+5
|\ \ \ \
| * | | | Ninja Multi-Config: Don't build target dependencies for custom commandsKyle Edwards2020-03-034-7/+5
| |/ / /
* | | | Merge topic 'doc-rel-3.16-updates' into release-3.17Brad King2020-03-041-0/+26
|\ \ \ \ | | |_|/ | |/| |
| * | | Help: Update CMake 3.16 release notes for 3.16.5Brad King2020-02-271-0/+26
| | |/ | |/|
* | | Merge branch 'release-3.16' into release-3.17Brad King2020-03-040-0/+0
|\ \ \ | |/ /
| * | Merge branch 'backport-3.16-FindPython-cache-cleanup' into release-3.16Brad King2020-02-271-51/+98
| |\ \
| | * | FindPython: Do not cache computed result variables in CMake 3.16Marc Chevrier2020-02-261-2/+2
| | * | FindPython: Mark non-public cache entries INTERNAL in CMake 3.16Marc Chevrier2020-02-261-48/+95
| * | | Merge branch 'FindPkgConfig-scope' into release-3.16Brad King2020-02-241-0/+6
| |\ \ \
| * \ \ \ Merge branch 'backport-cuda-non-device-link' into release-3.16Brad King2020-02-242-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-3.16-install-default-fix' into release-3.16Brad King2020-02-127-18/+50
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'release-3.15' into release-3.16Brad King2020-02-110-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-3.16-link-line-backtrace' into release-3.16Brad King2020-02-109-93/+85
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'libarchive-win-codepage' into release-3.16Brad King2020-02-061-2/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge topic 'FindPython-manage-SOABI-suffix' into release-3.17Brad King2020-03-046-14/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FindPython: python_add_library can now manage SOABI suffix.Marc Chevrier2020-03-036-14/+52
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge topic 'llvm-rc-defines-not-flags' into release-3.17Brad King2020-03-041-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | llvm-rc: Forward DEFINES instead of FLAGSThomas Bernard2020-03-031-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge topic 'ninja-multi-spurious-unused-variables' into release-3.17Brad King2020-03-043-2/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Ninja Multi-Config: Fix spurious unused variable warningKyle Edwards2020-03-033-2/+16
|/ / / / / / / /
* | | | | | | | CMake 3.17.0-rc2v3.17.0-rc2Brad King2020-03-021-1/+1
* | | | | | | | Merge topic 'ninja-multi-variable-shuffle-again' into release-3.17Brad King2020-02-2826-80/+159
|\ \ \ \ \ \ \ \
| * | | | | | | | Ninja Multi-Config: Always generate build.ninjaKyle Edwards2020-02-276-26/+16
| * | | | | | | | Generator: Don't allow Ninja Multi-Config variables on other generatorsKyle Edwards2020-02-2713-0/+91
| * | | | | | | | Ninja Multi-Config: Remove "NMC" from variable namesKyle Edwards2020-02-2712-60/+58
* | | | | | | | | Merge topic 'foreach-range-issues' into release-3.17Brad King2020-02-2823-6/+92
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | foreach: Set fatal error on invalid rangeKyle Edwards2020-02-275-0/+9
| * | | | | | | | | foreach: Fix crash when parsing invalid integerKyle Edwards2020-02-2720-6/+83
* | | | | | | | | | Merge topic 'q_namespace_export' into release-3.17Brad King2020-02-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOCRichard2020-02-261-1/+1
* | | | | | | | | | Merge topic 'pch-file-time' into release-3.17Brad King2020-02-271-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | PCH: Copy the timestamp from an absolute header fileCristian Adam2020-02-261-0/+13
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'update-kwsys' into release-3.17Brad King2020-02-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | KWSys: Terminal: Add st-256color to VT100 color support whitelistBrad King2020-02-251-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'FindPython-cache-cleanup' into release-3.17Brad King2020-02-271-55/+102
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | FindPython: Do not cache computed result variablesMarc Chevrier2020-02-261-2/+2
| * | | | | | | | | FindPython: Mark non-public cache entries INTERNALMarc Chevrier2020-02-261-52/+99
* | | | | | | | | | Merge topic 'backport-ctest-resource-allocation-doc' into release-3.17Brad King2020-02-261-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Help: Clarify that the CTest resource allocation feature doesn't oversubscribeKyle Edwards2020-02-261-0/+9
|/ / / / / / / / / /