diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-01 09:07:31 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-01 09:07:31 -0700 |
| commit | 605076a7aa0aec7bbc469fae4e9d0434fe639657 (patch) | |
| tree | 08f095684ff910e58c8952ad77ad7246af9d5437 /templates | |
| parent | 456ce490ea71d1146fd2fdf94bdcd65009e5d924 (diff) | |
Handle test dependencies better
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vsprojects/vcxproj_defs.include | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/templates/vsprojects/vcxproj_defs.include b/templates/vsprojects/vcxproj_defs.include index b371e95225..17fbf56232 100644 --- a/templates/vsprojects/vcxproj_defs.include +++ b/templates/vsprojects/vcxproj_defs.include @@ -11,6 +11,7 @@ if t.name == name: target = t props = project.vs_props + packages = project.vs_packages configuration_type = project.vs_config_type project_guid = project.vs_project_guid if target.build == 'test' and target.language == 'c++': @@ -21,13 +22,17 @@ else: if target.language == 'c++': props.extend(['protobuf']) - props.extend(['winsock', 'zlib', 'openssl']) + props.extend(['winsock', 'zlib']) + packages.extend(['grpc.dependencies.zlib']) + if target.get('secure', 'check'): + props.extend(['openssl']) + packages.extend(['grpc.dependencies.openssl']) else: props.extend(['winsock']) props.extend(['global']) props = sorted(list(set(props))) + packages = sorted(list(set(packages))) dll = project.get('dll', False) - packages = project.vs_packages repo_root = '..\..\..' + ('\..' if project.vs_proj_dir != '.' else '') %>\ <?xml version="1.0" encoding="utf-8"?> |