[12374] Compile fixes for CMake corrections.

(based on commit [12265] - b1b3349)