diff options
| author | Jose <jose@zeroc.com> | 2014-12-16 16:42:50 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-16 16:42:50 +0100 |
| commit | 6d97cacd4328656d8f4402ac1f19dc9b0448af76 (patch) | |
| tree | 9a91edcd048d8d56a306f78158bdce5d6281aa93 /scripts/TestUtil.py | |
| parent | WinRT SDK installer updates (diff) | |
| download | ice-6d97cacd4328656d8f4402ac1f19dc9b0448af76.tar.bz2 ice-6d97cacd4328656d8f4402ac1f19dc9b0448af76.tar.xz ice-6d97cacd4328656d8f4402ac1f19dc9b0448af76.zip | |
Fixed default compiler setting in TestUtil
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 5980da630a2..95daec53642 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -136,19 +136,20 @@ def getCppCompiler(): p = subprocess.Popen("cl", stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) if not p or not p.stdout: print("Cannot detect C++ compiler") - sys.exit(1) - l = p.stdout.readline().decode("utf-8").strip() - if l.find("Version 16") != -1: - compiler = "VC100" - elif l.find("Version 17") != -1: - compiler = "VC110" - elif l.find("Version 18") != -1: - compiler = "VC120" + compiler = VC120 else: - # - # Cannot detect C++ compiler use default - # - compiler = "VC120" + l = p.stdout.readline().decode("utf-8").strip() + if l.find("Version 16") != -1: + compiler = "VC100" + elif l.find("Version 17") != -1: + compiler = "VC110" + elif l.find("Version 18") != -1: + compiler = "VC120" + else: + # + # Cannot detect C++ compiler use default + # + compiler = "VC120" return compiler def isMINGW(): |