diff options
| author | Russel Winder <russel@winder.org.uk> | 2017-08-26 13:46:54 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2017-08-26 13:46:54 (GMT) |
| commit | f375f3b8988c559d32566d7709b4190970c650c6 (patch) | |
| tree | 20878e20d6085ca1a0910fc401cc0c7275f64bf1 /src/engine/SCons/Tool | |
| parent | 36c1fe9676b8a2f8d4d2174a05cb2d3c47806170 (diff) | |
| parent | ecb0e776746503141b7a1b970256e380156739d7 (diff) | |
| download | SCons-f375f3b8988c559d32566d7709b4190970c650c6.zip SCons-f375f3b8988c559d32566d7709b4190970c650c6.tar.gz SCons-f375f3b8988c559d32566d7709b4190970c650c6.tar.bz2 | |
Merge in mainline.
Diffstat (limited to 'src/engine/SCons/Tool')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/qt.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 7c9eab5..53bd397 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -245,7 +245,9 @@ def find_vc_pdir_vswhere(msvc_version): if os.path.exists(vswhere_path): sp = subprocess.Popen(vswhere_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) vsdir, err = sp.communicate() - vc_pdir = os.path.join(vsdir.rstrip(), 'VC') + vsdir = vsdir.decode("mbcs") + vsdir = vsdir.rstrip() + vc_pdir = os.path.join(vsdir, 'VC') return vc_pdir else: # No vswhere on system, no install info available diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py index 5f99054..77269a8 100644 --- a/src/engine/SCons/Tool/qt.py +++ b/src/engine/SCons/Tool/qt.py @@ -144,6 +144,8 @@ class _Automoc(object): # c or fortran source continue #cpp_contents = comment.sub('', cpp.get_text_contents()) + if debug: + print("scons: qt: Getting contents of %s" % cpp) cpp_contents = cpp.get_text_contents() h=None for h_ext in header_extensions: |