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/src/IceSSL | |
| 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/src/IceSSL')
4 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj index 59f9d0a9143..9f88686ae04 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj @@ -109,6 +109,7 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> <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> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> @@ -116,5 +117,6 @@ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> <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/src/IceSSL/msbuild/icesslopenssl++11/packages.config b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config index d2060e9c605..1e9cada2dfd 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <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/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj index c353ea777e1..0a3681bf346 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj @@ -115,6 +115,7 @@ <ImportGroup Label="ExtensionTargets"> <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> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> @@ -123,5 +124,6 @@ </PropertyGroup> <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/src/IceSSL/msbuild/icesslopenssl/packages.config b/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config index 7463df8173d..20dfbdbf8b3 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config @@ -2,4 +2,5 @@ <packages> <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 |