[z2183] Compile fixes for CMake corrections.

(based on commit [12265] - b1b3349)

(based on commit [s1816] - 7d358c0)