X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=meson.build;h=8114abbd1992711ccf17991c4c346992b5995d22;hp=8f636ad16776fc879371d046b5780ecc00664a2c;hb=HEAD;hpb=79a6263d2208acebff58b672586e07eae0d29ea6 diff --git a/meson.build b/meson.build index 8f636ad..b190b4a 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,6 @@ -project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.3.0') +project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.3.1-pre') + +add_project_arguments('-Wno-unqualified-std-cast-call', language: 'cpp') cxx = meson.get_compiler('cpp') qt5 = import('qt5') @@ -120,13 +122,10 @@ if have_cef cef_dll_target = custom_target('libcef_dll_wrapper', input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'), - output: ['libcef_dll_wrapper.a', 'cef-stamp'], + output: ['libcef_dll_wrapper.a'], command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@']) - # Putting the .a in sources seemingly hits a bug where the .a files get sorted - # in the wrong order. This is a workaround; see - # https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 . - cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path()) + cefdlldep = declare_dependency(link_with: cef_dll_target) nageru_deps += cefdlldep endif