Merge pull request #1 from wjwwood/master

upstream update
Update CMakeLists.txt
Update list_ports_win.cc