Small CMake improvements for Windows. AP-35