Skip to content

Commit

Permalink
French cl.exe prints "version", not "Version"!!
Browse files Browse the repository at this point in the history
  • Loading branch information
luc-j-bourhis committed Jan 26, 2016
1 parent ad95d45 commit 4da5218
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions libtbx/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -303,31 +303,34 @@ if (sys.platform == "win32" or
if VS_UNICODE_OUTPUT is not None:
# Reset VS_UNICODE_OUTPUT
os.environ['VS_UNICODE_OUTPUT'] = VS_UNICODE_OUTPUT
if (cl_info.find("Version 13.10") >= 0):
cl_ver_pat = re.compile(r'[Vv]ersion \W+ (\d+\.\d+)', re.X)
m = cl_ver_pat.search(cl_info)
visual_studio_version = m.group(1) if m is not None else None
if visual_studio_version == "13.10":
env_base = Environment(ENV=os.environ, MSVC_VERSION="7.1")
env_etc.have_manifest_tool = False
env_etc.msvc_version = 7
elif (cl_info.find("Version 14.00") >= 0):
elif visual_studio_version == "14.00":
env_base = Environment(
ENV=os.environ, MSVC_VERSION="8.0", TARGET_ARCH=target_arch)
env_etc.have_manifest_tool = True
env_etc.msvc_version = 8
elif (cl_info.find("Version 15.00") >= 0):
elif visual_studio_version == "15.00":
env_base = Environment(
ENV=os.environ, MSVC_VERSION="9.0", TARGET_ARCH=target_arch)
env_etc.have_manifest_tool = True
env_etc.msvc_version = 9
elif (cl_info.find("Version 16.00") >= 0):
elif visual_studio_version == "16.00":
env_base = Environment(
ENV=os.environ, MSVC_VERSION="10.0", TARGET_ARCH=target_arch)
env_etc.have_manifest_tool = True
env_etc.msvc_version = 10
elif (cl_info.find("Version 17.00") >= 0):
elif visual_studio_version == "17.00":
env_base = Environment(
ENV=os.environ, MSVC_VERSION="11.0", TARGET_ARCH=target_arch)
env_etc.have_manifest_tool = True
env_etc.msvc_version = 11
elif (cl_info.find("Version 18.00") >= 0):
elif visual_studio_version == "18.00":
env_base = Environment(
ENV=os.environ, MSVC_VERSION="12.0", TARGET_ARCH=target_arch)
env_etc.have_manifest_tool = True
Expand Down

0 comments on commit 4da5218

Please sign in to comment.