[ros-diffs] [jgardou] 53508: [CMAKE] - try to fix gcc build without breaking msvc