* fix mac ci?

* try that

* revert that

* try

* almost

* lib

* no 5?
pull/59/head
Adeeb Shihadeh 4 years ago committed by GitHub
parent f126118bc0
commit 9d92c36dca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      SConstruct

@ -264,20 +264,18 @@ Export('envCython')
# Qt build environment # Qt build environment
qt_env = env.Clone() qt_env = env.Clone()
qt_modules = ["Widgets", "Gui", "Core", "Network", "Concurrent", "Multimedia"] qt_modules = ["Widgets", "Gui", "Core", "Network", "Concurrent", "Multimedia"]
if arch != "aarch64": if arch != "aarch64":
qt_modules += ["DBus", "WebEngine", "WebEngineWidgets"] qt_modules += ["DBus", "WebEngine", "WebEngineWidgets"]
qt_libs = [] qt_libs = []
if arch == "Darwin": if arch == "Darwin":
qt_env['QTDIR'] = "/usr/local/opt/qt" qt_env['QTDIR'] = "/usr/local/opt/qt5"
QT_BASE = "/usr/local/opt/qt/"
qt_dirs = [ qt_dirs = [
QT_BASE + "include/", os.path.join(qt_env['QTDIR'], "include"),
] ]
qt_dirs += [f"{QT_BASE}include/Qt{m}" for m in qt_modules] qt_dirs += [f"{qt_env['QTDIR']}/include/Qt{m}" for m in qt_modules]
qt_env["LINKFLAGS"] += ["-F" + QT_BASE + "lib"] qt_env["LINKFLAGS"] += ["-F" + os.path.join(qt_env['QTDIR'], "lib")]
qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules] + ["OpenGL"] qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules] + ["OpenGL"]
elif arch == "aarch64": elif arch == "aarch64":
qt_env['QTDIR'] = "/system/comma/usr" qt_env['QTDIR'] = "/system/comma/usr"
@ -292,7 +290,6 @@ else:
qt_env['QTDIR'] = "/usr" qt_env['QTDIR'] = "/usr"
qt_dirs = [ qt_dirs = [
f"/usr/include/{real_arch}-linux-gnu/qt5", f"/usr/include/{real_arch}-linux-gnu/qt5",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.5.1/QtGui",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui", f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui",
] ]
qt_dirs += [f"/usr/include/{real_arch}-linux-gnu/qt5/Qt{m}" for m in qt_modules] qt_dirs += [f"/usr/include/{real_arch}-linux-gnu/qt5/Qt{m}" for m in qt_modules]

Loading…
Cancel
Save