[ros-diffs] [akhaldi] 51784: [CMAKE] * Fix cmake build on trunk.