Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-04-10 14:37:00 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-04-10 15:07:30 (GMT) |
| commit | 3e9f6f98ae3d042ade8419a0c07a559abe7bd1fc (patch) | |
| tree | 4f5a55469e751606fad1093a6fb2efdb1bc47e40 /Swift | |
| parent | de89a73ff9c7575323cb61e358e8e3c8274214e4 (diff) | |
| download | swift-3e9f6f98ae3d042ade8419a0c07a559abe7bd1fc.zip swift-3e9f6f98ae3d042ade8419a0c07a559abe7bd1fc.tar.bz2 | |
Only add existing environment variables to QtUI test env
Furthermore extended the list of potential environment
variables based on what the qt4.py tool creates.
Fix for commit ed2226782ac15345aeb8e615b41d30e5aab67b51.
Test-Information:
Tested on Windows 8 with VS2013 with Qt 5.4.2 and on
macOS 10.12.4 with Qt 5.5.1.
Change-Id: Ib52084ca0e1505fe943c33fa74f479e360d834fe
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/SConscript | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 3ce2057..ff97b42 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -49,65 +49,64 @@ if myenv.get("HAVE_HUNSPELL", True): if env["PLATFORM"] == "win32" : myenv.Append(LIBS = ["cryptui"]) myenv.UseFlags(myenv["PLATFORM_FLAGS"]) myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"]) myenv.Tool("wix", toolpath = ["#/BuildTools/SCons/Tools"]) myenv.Tool("textfile", toolpath = ["#/BuildTools/SCons/Tools"]) qt4modules = ['QtCore', 'QtWebKit', 'QtGui'] if myenv["qt5"] : qt_version = '5' # QtSvg is required so the image format plugin for SVG images is installed # correctly by Qt's deployment tools. qt4modules += ['QtWidgets', 'QtWebKitWidgets', 'QtMultimedia', 'QtSvg'] if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" : qt4modules += ['QtX11Extras'] else : qt_version = '4' if env["PLATFORM"] == "posix" : qt4modules += ["QtDBus"] if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" : qt4modules += ["QtNetwork"] myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version) ## Qt related unit tests testQtEnv = env.Clone(); testQtEnv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) testQtEnv.EnableQt4Modules(qt4modules, debug = False, version = qt_version) -env["SWIFT_QTUI_TEST_FLAGS"] = { - "CPPFLAGS": testQtEnv["CPPFLAGS"], - "LIBS": testQtEnv["LIBS"], - "LINKFLAGS": testQtEnv["LINKFLAGS"], -} +env["SWIFT_QTUI_TEST_FLAGS"] = {} +for key in ["CCFLAGS", "CPPFLAGS", "CPPPATH", "CPPDEFINES", "LIBS", "LINKFLAGS", "LIBPATH"] : + if key in testQtEnv: + env["SWIFT_QTUI_TEST_FLAGS"][key] = testQtEnv[key] env.Append(UNITTEST_SOURCES = [ File("UnitTest/QtUtilitiesTest.cpp") ]) myenv.Append(CPPPATH = ["."]) # Qt requires applications to be build with the -fPIC flag on some 32-bit Linux distributions. if env["PLATFORM"] == "posix" : testEnv = myenv.Clone() conf = Configure(testEnv) if conf.CheckDeclaration("QT_REDUCE_RELOCATIONS", "#include <QtCore/qconfig.h>") and conf.CheckDeclaration("__i386__"): myenv.AppendUnique(CXXFLAGS = "-fPIC") testEnv = conf.Finish() if env["PLATFORM"] == "win32" : #myenv.Append(LINKFLAGS = ["/SUBSYSTEM:CONSOLE"]) myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"]) myenv.Append(LIBS = "qtmain") if myenv.get("HAVE_SCHANNEL", 0) : myenv.Append(LIBS = "Cryptui") myenv.Append(CPPDEFINES = "HAVE_SCHANNEL") if env["PLATFORM"] == "darwin" and env["HAVE_SPARKLE"] : myenv.Append(LINKFLAGS = ["-Wl,-rpath,@loader_path/../Frameworks"]) myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateQRCTheme(myenv.Dir("#/Swift/resources/themes/Default"), "Default"))) sources = [ "main.cpp", |