Merge proposals dependent on lp://staging/~pete-woods/ubuntu-settings-components/cmake-extras-compatibility

lp://staging/~pete-woods/ubuntu-settings-components/cmake-extras-compatibility has no merge proposals.