Fix Cmake build options for CLI on Visual Studio.
Fix some missing cases in switches