Swiftdiff options
Diffstat (limited to 'BuildTools/SCons/Tools')
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index f4b59e3..1c82324 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -41,12 +41,14 @@ import SCons.Action import SCons.Builder import SCons.Defaults import SCons.Scanner import SCons.Tool import SCons.Util +Import("conf_env") + class ToolQtWarning(SCons.Warnings.Warning): pass class GeneratedMocFileNotIncluded(ToolQtWarning): pass @@ -500,19 +502,20 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4' self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR","include")]) self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR","include", module)]) self["QT4_MOCCPPPATH"] = self["CPPPATH"] return else: test_env = self.Clone() + test_conf = Configure(test_env) modules_str = " ".join(modules) if not version == '4' : modules_str = modules_str.replace('Qt', 'Qt5') # Check if Qt is registed at pkg-config - ret = test_env.TryAction('pkg-config --exists \'%s\'' % modules_str)[0] - test_env.Result( ret ) + ret = test_conf.TryAction('pkg-config --exists \'%s\'' % modules_str)[0] + test_conf.Result( ret ) if not ret: print("Qt not found.") return test_env.ParseConfig("pkg-config --cflags --libs " + modules_str) self.AppendUnique(LIBS=test_env["LIBS"], LIBPATH=test_env["LIBPATH"], CPPPATH=test_env["CPPPATH"]) self["QT4_MOCCPPPATH"] = self["CPPPATH"] |