Commit Graph

3 Commits

Author SHA1 Message Date
Paul "TBBle" Hampson
d409857781 cmake: Update to 3.11.1 (#3545) (#3628)
The patch series was recreated by applying it to a CMake git checkout at
v3.10.1, and then rebasing it onto v3.11.0, followed by patch resync
with CMake 3.11.1

Patch 0004-Implement-Qt5-static-plugin-support.patch had to be
extensively redone, to support a refactoring in the Qt5 auto-gen support
in CMake 3.11.0. The rest of the patches are changed only due to
artifacts of this rebasing.
2018-04-25 07:51:58 +03:00
Paul "TBBle" Hampson
1ad389907c CMake 3.10.1 (#3262)
* cmake: Upgrade CMake package to 3.10.1

0004-Implement-Qt5-static-plugin-support.patch does not apply cleanly.

* cmake: Rebase the patch series onto 3.10.1

The patch series was applied using `git am` to a CMake v3.9.6 git
checkout, and then those commits were rebased onto CMake v3.10.1.

`git format-patch` was used to extract the patches again, as was
presumably originally done. In this case, I kept the existing numbers to
keep the patch readable, and avoid confusing file renames.

Only 0004-Implement-Qt5-static-plugin-support.patch needed manual
changes.

* cmake: CMake now unconditionally enables server mode

* cmake: Remove dead unit-test munging

This code appears to have been updating the paths in a CMake Unit Test
to match the live paths in MSYS2.

However, it was disabled when added (see #2633), and doesn't make sense
since the test is only of the parsing of the output format, not the
contents of the output.
2018-01-09 09:40:18 +03:00
Ray Donnelly
536d94d597 cmake: Update to 3.8.1 and enable server mode 2017-05-03 13:25:11 +01:00