Merge proposals dependent on lp:~pete-woods/cmake-extras/drop-deprecated-macros-lp1563573

lp:~pete-woods/cmake-extras/drop-deprecated-macros-lp1563573 has no merge proposals.