FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

msvc: fix check of intel composer version with visual studio 2010 

Signed-off-by: Thomas Nagy <tnagy1024@gmail.com>
This commit is contained in:
Stian Selnes 2013-03-23 09:23:02 +01:00 committed by Thomas Nagy
parent c3cbd4c353
commit 336c3f2e3f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
waflib/Tools/msvc.py
View File

@ -496,14 +496,16 @@ def gather_intel_composer_versions(conf, versions):
setattr(conf, compilervars_warning_attr, False) setattr(conf, compilervars_warning_attr, False)
patch_url = 'http://software.intel.com/en-us/forums/topic/328487' patch_url = 'http://software.intel.com/en-us/forums/topic/328487'
compilervars_arch = os.path.join(path, 'bin', 'compilervars_arch.bat') compilervars_arch = os.path.join(path, 'bin', 'compilervars_arch.bat')
vs_express_path = os.environ['VS110COMNTOOLS'] + r'..\IDE\VSWinExpress.exe' for vscomntools in ['VS110COMNTOOLS', 'VS100COMNTOOLS']:
dev_env_path = os.environ['VS110COMNTOOLS'] + r'..\IDE\devenv.exe' if os.environ.has_key (vscomntools):
if (r'if exist "%VS110COMNTOOLS%..\IDE\VSWinExpress.exe"' in Utils.readf(compilervars_arch) and vs_express_path = os.environ[vscomntools] + r'..\IDE\VSWinExpress.exe'
not os.path.exists(vs_express_path) and not os.path.exists(dev_env_path)): dev_env_path = os.environ[vscomntools] + r'..\IDE\devenv.exe'
Logs.warn(('The Intel compilervar_arch.bat only checks for one Visual Studio SKU ' if (r'if exist "%VS110COMNTOOLS%..\IDE\VSWinExpress.exe"' in Utils.readf(compilervars_arch) and
'(VSWinExpress.exe) but it does not seem to be installed at %r. ' not os.path.exists(vs_express_path) and not os.path.exists(dev_env_path)):
'The intel command line set up will fail to configure unless the file %r' Logs.warn(('The Intel compilervar_arch.bat only checks for one Visual Studio SKU '
'is patched. See: %s') % (vs_express_path, compilervars_arch, patch_url)) '(VSWinExpress.exe) but it does not seem to be installed at %r. '
'The intel command line set up will fail to configure unless the file %r'
'is patched. See: %s') % (vs_express_path, compilervars_arch, patch_url))
except WindowsError: except WindowsError:
pass pass
major = version[0:2] major = version[0:2]