[ros-diffs] [janderwald] 50601: [PORTCLS] - Try fix msvc issues for cmake branch