Merge proposals dependent on lp:~pete-woods/unity-scope-click/cmake-extras-compatibility

lp:~pete-woods/unity-scope-click/cmake-extras-compatibility has no merge proposals.