CmakeLists updates for Win32 Platform