diff options
| author | Jose <jose@zeroc.com> | 2017-06-13 17:39:32 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-13 17:39:32 +0200 |
| commit | b0e9ae8890eb4fee5f7569f97250183b1639b896 (patch) | |
| tree | e69cfe967ef6083c36a9a8749158aa96234fc967 /php/src | |
| parent | Fixed ICE-8037 - test deadlock and bumped timeout for wait (diff) | |
| download | ice-b0e9ae8890eb4fee5f7569f97250183b1639b896.tar.bz2 ice-b0e9ae8890eb4fee5f7569f97250183b1639b896.tar.xz ice-b0e9ae8890eb4fee5f7569f97250183b1639b896.zip | |
PHP build fixes
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/php7/msbuild/packages.config | 1 | ||||
| -rw-r--r-- | php/src/php7/msbuild/php_ice.vcxproj | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/php/src/php7/msbuild/packages.config b/php/src/php7/msbuild/packages.config index f5be7aa5c69..94281940acc 100644 --- a/php/src/php7/msbuild/packages.config +++ b/php/src/php7/msbuild/packages.config @@ -2,5 +2,4 @@ <packages> <package id="php-7.0.v140" version="7.0.13" targetFramework="native" /> <package id="php-7.1.v140" version="7.1.4.1" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/php/src/php7/msbuild/php_ice.vcxproj b/php/src/php7/msbuild/php_ice.vcxproj index e0346b4c108..c6923729fc6 100644 --- a/php/src/php7/msbuild/php_ice.vcxproj +++ b/php/src/php7/msbuild/php_ice.vcxproj @@ -250,7 +250,7 @@ <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props')) And '$(ICE_BIN_DIST)' == 'cpp'" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets')) And '$(ICE_BIN_DIST)' == 'cpp'" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> </Target> </Project>
\ No newline at end of file |