From c204f05178e554a6887bccda2c6bdba905b88241 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Wed, 25 May 2011 16:33:44 +0000 Subject: [PATCH] Re-enable the broken no-autodetect feature git-svn-id: https://waf.googlecode.com/svn/trunk@11299 f0382ac9-c320-0410-b3f0-b508d59f5a85 --- waflib/Tools/msvc.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py index 0a154b538..5189aef40 100644 --- a/waflib/Tools/msvc.py +++ b/waflib/Tools/msvc.py @@ -553,7 +553,7 @@ def autodetect(conf): v['INCLUDES'] = includes v['LIBPATH'] = libdirs v['MSVC_COMPILER'] = compiler - v['CC_VERSION'] = (str(version), '0', '0') + v['MSVC_VERSION'] = float(version) def _get_prog_names(conf, compiler): if compiler=='intel': @@ -573,13 +573,11 @@ def find_msvc(conf): if sys.platform == 'cygwin': conf.fatal('MSVC module does not work under cygwin Python!') + # the autodetection is supposed to be performed before entering in this method v = conf.env - - compiler, version, path, includes, libdirs = detect_msvc(conf) - v['PATH'] = path - v['INCLUDES'] = includes - v['LIBPATH'] = libdirs - v['MSVC_VERSION'] = float(version) + path = v['PATH'] + compiler = v['MSVC_COMPILER'] + version = v['MSVC_VERSION'] compiler_name, linker_name, lib_name = _get_prog_names(conf, compiler) v.MSVC_MANIFEST = (compiler == 'msvc' and float(version) >= 8) or (compiler == 'wsdk' and float(version) >= 6) or (compiler == 'intel' and float(version) >= 11) -- 2.34.1