[ros-diffs] [akhaldi] 57211: [CMAKE] * Improve this one while we're at it.