[ros-diffs] [spetreolle] 49246: [CMAKE] sync with trunk (r49230)