diff options
| author | Jose <jose@zeroc.com> | 2019-07-27 11:32:04 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-27 11:32:04 +0200 |
| commit | e56617ebd98069c8cf5fc040f5780c3d9630f4eb (patch) | |
| tree | bf3575345a45fa18b583a2f00c5b970713c9b932 | |
| parent | Update Ice version to 3.6.5 (diff) | |
| download | ice-e56617ebd98069c8cf5fc040f5780c3d9630f4eb.tar.bz2 ice-e56617ebd98069c8cf5fc040f5780c3d9630f4eb.tar.xz ice-e56617ebd98069c8cf5fc040f5780c3d9630f4eb.zip | |
Do not check ICE_HOME when importing Ice.props
That fix allows building from command line with msbuild builder
setting only IceHome, otherwise we have to set both ICE_HOME and
IceHome.
| -rw-r--r-- | cpp/config/Ice.props | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/config/Ice.props b/cpp/config/Ice.props index 42f50feb209..ba4cc15594f 100644 --- a/cpp/config/Ice.props +++ b/cpp/config/Ice.props @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="IceHome" Condition="'$(ICE_HOME)' != ''"> - <IceHome>$(ICE_HOME)</IceHome> + <PropertyGroup Label="IceHome"> <IceVersion>3.6.5</IceVersion> <IceIntVersion>30605</IceIntVersion> <IceVersionMM>3.6</IceVersionMM> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> |