Update cmake to generate source folders in VS Brought parallel changes from trunk Tested: local linux