diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-04 09:26:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-04 09:26:20 +0100 |
| commit | 93fe786f6824df71f5f912754f0bd8e7bf1424e7 (patch) | |
| tree | 96ed2d9710d9106a712e05aa9cf0dd0f376d010f /demoscript | |
| parent | ICE-6043 - bumping timeout for IceDiscovery test (diff) | |
| download | ice-93fe786f6824df71f5f912754f0bd8e7bf1424e7.tar.bz2 ice-93fe786f6824df71f5f912754f0bd8e7bf1424e7.tar.xz ice-93fe786f6824df71f5f912754f0bd8e7bf1424e7.zip | |
Minor fix to Util.py
Diffstat (limited to 'demoscript')
| -rw-r--r-- | demoscript/Util.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 03f1b988dd2..4c5680363e6 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -320,13 +320,14 @@ def configurePaths(): # # Add third party home to PATH, to use db_xx tools # - if isWin32(): - addenv("PATH", os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "bin")) - if getCppCompiler() == "VC110": - addenv("PATH", os.path.join(getThirdpartyHome(), "bin\\vc110\\x64" if x64 else "bin\\vc110")) - elif isDarwin(): - addenv("PATH", os.path.join(getThirdpartyHome(), "bin")) - + thirdPartyHome = getThirdpartyHome() + if thirdPartyHome: + if isWin32(): + addenv("PATH", os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "bin")) + if getCppCompiler() == "VC110": + addenv("PATH", os.path.join(getThirdpartyHome(), "bin\\vc110\\x64" if x64 else "bin\\vc110")) + elif isDarwin(): + addenv("PATH", os.path.join(getThirdpartyHome(), "bin")) if binDir != os.path.join(getIceDir("cpp"), "bin"): addenv("PATH", binDir) |