Some cleanup in CMake files.

Signed-off-by: anuka <david.vas1@gmail.com>