diff options
| author |  yang-g <yangg@google.com> | 2016-01-15 14:09:24 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-01-15 14:09:24 -0800 |
| commit | 512c4f7447740b52807b51e79ae64c6d439bfdf5 (patch) | |
| tree | 53783d9c33a570333568c66001247b5dd03c894d /vsprojects/vcxproj/test/end2end_test | |
| parent | 4fac82b6728d16212a9ba7e3d78f8cc6ac9df357 (diff) | |
| parent | 623ca7dd9408fea1b6e88be0ca1e0f845a0533e8 (diff) | |
Merge remote-tracking branch 'upstream/master' into sync_async_mix
Diffstat (limited to 'vsprojects/vcxproj/test/end2end_test')
| -rw-r--r-- | vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj b/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj index 765a38283d..c04742ffee 100644 --- a/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj @@ -65,12 +65,14 @@ <TargetName>end2end_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> <TargetName>end2end_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Release</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> <Configuration-grpc_dependencies_openssl>Release</Configuration-grpc_dependencies_openssl> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |