diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-05-31 09:55:54 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-05-31 09:55:54 +0200 |
| commit | 1004b13a99dc69d2b1fdc2dd63a037d77849baea (patch) | |
| tree | ff83466d6ba0edb84bf56e1ea65594db80799a7f /scripts/Component.py | |
| parent | Fixed bug where component libs/systemlib wouldn't be added to linker flags wh... (diff) | |
| download | ice-1004b13a99dc69d2b1fdc2dd63a037d77849baea.tar.bz2 ice-1004b13a99dc69d2b1fdc2dd63a037d77849baea.tar.xz ice-1004b13a99dc69d2b1fdc2dd63a037d77849baea.zip | |
Fixed Util.py check for binary installation directory on Windows
Diffstat (limited to 'scripts/Component.py')
| -rw-r--r-- | scripts/Component.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Component.py b/scripts/Component.py index a337b961708..786d8d32c51 100644 --- a/scripts/Component.py +++ b/scripts/Component.py @@ -38,7 +38,9 @@ class Ice(Component): return Component._useBinDist(self, mapping, current, "ICE_BIN_DIST") def getInstallDir(self, mapping, current): - return Component._getInstallDir(self, mapping, current, "ICE_HOME") + # On Windows, the Ice MSI installation can only be used for C++ + envHomeName = None if isinstance(platform, Windows) and not isinstance(mapping, CppMapping) else "ICE_HOME" + return Component._getInstallDir(self, mapping, current, envHomeName) def getPhpExtension(self, mapping, current): if isinstance(platform, Windows): |