CMake - fixes for uninitialized variables
(cherry picked from commit 378fb942e1ecca88767463f26a021825ec273d82)