diff options
| author | Jose <jose@zeroc.com> | 2016-12-13 12:05:08 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-12-13 12:05:08 +0100 |
| commit | b5a52c5015b8e2766276414024314f83f49e7841 (patch) | |
| tree | 648f89062c060c043cd8512ebffc6bbfb5ed7fda /scripts/Util.py | |
| parent | Do not use Nuget packages with PHP tests (diff) | |
| download | ice-b5a52c5015b8e2766276414024314f83f49e7841.tar.bz2 ice-b5a52c5015b8e2766276414024314f83f49e7841.tar.xz ice-b5a52c5015b8e2766276414024314f83f49e7841.zip | |
Fix bin dir for CppMapping
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 1870b985f5d..97e1c26135c 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -216,10 +216,10 @@ class Windows(Platform): pass # Nothing to do, we don't support the make build system on Windows def getDefaultBuildPlatform(self): - return "Win32" + return "x64" def getDefaultBuildConfig(self): - return "Debug" + return "Release" def getCompiler(self): out = run("cl") @@ -241,7 +241,8 @@ class Windows(Platform): if current.driver.useBinDist(): iceHome = os.environ.get("ICE_HOME") - if iceHome: + + if iceHome and isinstance(mapping, CppMapping) and config == "Release" and platform == "x64": return "bin" if isinstance(mapping, CSharpMapping) or isinstance(process, SliceTranslator): return os.path.join("tools") |