[ros-diffs] [akhaldi] 60036: [SVCHOST] * CMake file improvements.