diff options
| author | Jose <jose@zeroc.com> | 2015-05-15 10:09:07 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-05-15 10:09:07 +0200 |
| commit | 6f5a6ebfb4c00c1a4566a423bd58a64e4a4beb3b (patch) | |
| tree | 406b01d359ffb67cbe3052bed39b9f893c115810 /cpp/config | |
| parent | Updates for windows mkdir usage (diff) | |
| download | ice-6f5a6ebfb4c00c1a4566a423bd58a64e4a4beb3b.tar.bz2 ice-6f5a6ebfb4c00c1a4566a423bd58a64e4a4beb3b.tar.xz ice-6f5a6ebfb4c00c1a4566a423bd58a64e4a4beb3b.zip | |
Move Ice.pros to cpp/config and install it
Diffstat (limited to 'cpp/config')
| -rw-r--r-- | cpp/config/Ice.props | 10 | ||||
| -rw-r--r-- | cpp/config/Makefile.mak | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cpp/config/Ice.props b/cpp/config/Ice.props new file mode 100644 index 00000000000..a9efcc620ad --- /dev/null +++ b/cpp/config/Ice.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2009-2015 ZeroC, Inc. All rights reserved. --> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="IceHome" Condition="'$(ICE_HOME)' != ''"> + <IceHome>$(ICE_HOME)</IceHome> + <IceVersion>3.6.0</IceVersion> + <IceIntVersion>36000</IceIntVersion> + <IceVersionMM>3.6</IceVersionMM> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/cpp/config/Makefile.mak b/cpp/config/Makefile.mak index baa20932dce..35f08530f0b 100644 --- a/cpp/config/Makefile.mak +++ b/cpp/config/Makefile.mak @@ -19,3 +19,4 @@ install:: copy glacier2router.cfg "$(install_configdir)" copy icegrid-slice.3.5.ice.gz "$(install_configdir)" copy icegrid-slice.3.6.ice.gz "$(install_configdir)" + copy Ice.props "$(install_configdir)" |