Fix CMP0063, clean up top-level CMakeLists.txt a bit

Authored by valeriymalov on Jan 1 2018, 12:05 PM.