CMake Updates for Visual Studio