diff options
| author | Jose <jose@zeroc.com> | 2019-01-28 17:36:29 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-01-28 17:37:28 +0100 |
| commit | 8701fe8ed61225997a12f9d20d0553dd8d1ccfc0 (patch) | |
| tree | c8d42fecf06dd481f9c2bcc01b7c28bf325f9ba3 /cpp/test/IceSSL/configuration | |
| parent | Fix test in metrics test (diff) | |
| download | ice-8701fe8ed61225997a12f9d20d0553dd8d1ccfc0.tar.bz2 ice-8701fe8ed61225997a12f9d20d0553dd8d1ccfc0.tar.xz ice-8701fe8ed61225997a12f9d20d0553dd8d1ccfc0.zip | |
Support icessl openssl with Visual Studio 2017
Diffstat (limited to 'cpp/test/IceSSL/configuration')
4 files changed, 6 insertions, 0 deletions
diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj index e1bb8f0dd90..41b1a496ea9 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj @@ -90,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -352,5 +353,6 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config index 14798a16106..ace618eccc2 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config @@ -5,4 +5,5 @@ <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> <package id="zeroc.openssl.v120" version="1.0.2.6" targetFramework="native" /> <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" /> + <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config index 14798a16106..ace618eccc2 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config @@ -5,4 +5,5 @@ <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> <package id="zeroc.openssl.v120" version="1.0.2.6" targetFramework="native" /> <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" /> + <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj index f1014e64f84..fedc80e0fb8 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj @@ -90,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -358,5 +359,6 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" /> </Target> </Project>
\ No newline at end of file |