CMake: Make final fixes for Windows.
9 files changed