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

Don't save/print MSVC_INSTALLED_VERSIONS for lazy detection.

This commit is contained in:
Shawn Hoover 2015-09-09 10:52:20 -04:00
parent 48e48babb4
commit b00b9ab4e3
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
waflib/Tools/msvc.py
View File

@ -383,7 +383,7 @@ class lazytup(object):
def evaluate(self):
if hasattr(self, 'value'):
return
self.value = self.fn()
self.value = self.fn()
@conf
def gather_msvc_targets(conf, versions, version, vc_path):
@ -606,14 +606,20 @@ def get_msvc_versions(conf):
:return: list of compilers installed
:rtype: list of string
"""
if not conf.env['MSVC_INSTALLED_VERSIONS']:
lst = []
conf.gather_icl_versions(lst)
conf.gather_intel_composer_versions(lst)
conf.gather_wsdk_versions(lst)
conf.gather_msvc_versions(lst)
if conf.env['MSVC_INSTALLED_VERSIONS']:
return conf.env['MSVC_INSTALLED_VERSIONS']
lst = []
conf.gather_icl_versions(lst)
conf.gather_intel_composer_versions(lst)
conf.gather_wsdk_versions(lst)
conf.gather_msvc_versions(lst)
lazy = getattr(Options.options, 'msvc_lazy_autodetect', False) or conf.env['MSVC_LAZY_AUTODETECT']
if not lazy:
conf.env['MSVC_INSTALLED_VERSIONS'] = lst
return conf.env['MSVC_INSTALLED_VERSIONS']
return lst
@conf
def print_all_msvc_detected(conf):