Update WebKit and JSC dependencies in Meson build.

* bindings/meson.build: Declare a dependency for JSC that includes both
  the lib, VAPI and appropriate build directory. Update WK dependencies
  to reflect the same that their pkg-config files currently do, sort.

* meson.build: Rename top-level JSC deps to make it clear what they are
  for.

* src/engine/meson.build: Depend on JSC rather than WK, sort deps.
This commit is contained in:
Michael James Gratton 2017-12-15 15:08:02 +11:00
parent 3c436db0e1
commit a972236bb2
3 changed files with 26 additions and 18 deletions

View file

@ -59,8 +59,8 @@ gcr = dependency('gcr-3', version: '>= 3.10.1')
gobject_introspection = dependency('gobject-introspection-1.0')
webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
javascriptcore = valac.find_library('javascriptcore-4.0', dirs: vapi_dir)
javascriptcoregtk = cc.find_library('javascriptcoregtk-4.0', version: '>=' + target_webkit)
javascriptcoregtk_lib = cc.find_library('javascriptcoregtk-4.0', version: '>=' + target_webkit)
javascriptcoregtk_vapi = valac.find_library('javascriptcore-4.0', dirs: vapi_dir)
enchant = dependency('enchant', version: '>= 1.6')
libunwind = declare_dependency(
dependencies: [