diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-03-19 19:21:15 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-03-19 19:21:15 +0100 |
| commit | f0863b02270f1b95d5c8b9f3f962959e4cbbdd42 (patch) | |
| tree | e8a441a621d0addfa82a8fc3052080e78a012a2a /tools/buildgen | |
| parent | f358573091ef9c14c39ea56d9d9883410a533992 (diff) | |
| parent | 43c5fe6825098b127e33159d3cf14ac937ce7db5 (diff) | |
Merge branch 'master' of github.com:google/grpc into freebsd
Conflicts:
Makefile
templates/Makefile.template
Diffstat (limited to 'tools/buildgen')
| -rwxr-xr-x | tools/buildgen/plugins/generate_vsprojects.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/buildgen/plugins/generate_vsprojects.py b/tools/buildgen/plugins/generate_vsprojects.py index 6cbd74df66..f00c176214 100755 --- a/tools/buildgen/plugins/generate_vsprojects.py +++ b/tools/buildgen/plugins/generate_vsprojects.py @@ -57,9 +57,8 @@ def mako_plugin(dictionary): projects = [project for project in projects if project.get('vs_project_guid', None)] - # Exclude C++ projects for now projects = [project for project in projects - if not project['language'] == 'c++'] + if project['language'] != 'c++' or project['build'] == 'all'] project_dict = dict([(p['name'], p) for p in projects]) |