From f9ea03470e3a0bbe67ccb0a531dcf0e39aec1e90 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 30 Mar 2020 14:08:41 +0300 Subject: Move scripts/rcc to top level - add rcc generator for use when importing as subproject --- meson.build | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index d49e251..5c7cd65 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,13 @@ project('libembed', ['cpp'], + version: '0.1', default_options: ['cpp_std=c++2a', 'warning_level=3'], ) +if not meson.is_subproject() # libstdc++ lacks std::span at the moment add_project_arguments(['-stdlib=libc++'], language: 'cpp') add_project_link_arguments(['-stdlib=libc++'], language : 'cpp') +endif libzstd = dependency('libzstd') @@ -12,40 +15,41 @@ libembed_sourceset = import('sourceset').source_set() libembed_sourceset.add(when: libzstd, if_true: [ libzstd, files('lib/zstd.cpp') ] ) libembed_conf = libembed_sourceset.apply(configuration_data()) -libembed = library('embed', - libembed_conf.sources(), - dependencies: libembed_conf.dependencies(), - include_directories: '3rd-party/frozen/include/' +libembed = library('embed', libembed_conf.sources(), + dependencies: libembed_conf.dependencies() ) -dep_embed = declare_dependency( +libembed_dep = declare_dependency( link_with: libembed, - include_directories: include_directories('lib/', '3rd-party/frozen/include') + include_directories: include_directories('lib/') ) prog_python = import('python').find_installation('python3') -resources_h = custom_target('resources.h', - output: 'resources.h', - input: 'scripts/rcc', - command: [prog_python, '@INPUT@', '--namespace=staticdata', '--output=@OUTPUT@', '-', files('test/resources.xrc')], +rcc = generator(prog_python, + output: '@BASENAME@.h', + arguments: [ meson.current_source_dir()/'rcc', '--output=@OUTPUT@', '@EXTRA_ARGS@', '@INPUT@' ] ) +if not meson.is_subproject() +resources_h = rcc.process(files('test/resources.xrc'), extra_args: [ '--namespace=staticdata', '-' ]) + zstd_dictionary = custom_target('zstd_dictionary', output: 'zstd_dict', - input: 'scripts/rcc', + input: 'rcc', command: [ prog_python, '@INPUT@', 'Zstd', '--train=@OUTPUT@', files('test/resources.xrc') ] ) zstd_resources_h = custom_target('zstd_resources.h', output: 'zstd_resources.h', - input: [ 'scripts/rcc', zstd_dictionary ], + input: [ 'rcc', zstd_dictionary ], command: [prog_python, '@INPUT0@', '--namespace=zstd_data', '--output=@OUTPUT@', 'Zstd', '--dict=@INPUT1@', files('test/resources.xrc')], ) test('libembed', executable('embed', sources: [ 'test/main.cpp', resources_h, zstd_resources_h ], - dependencies: [ dep_embed ] + dependencies: [ libembed_dep ] ) ) +endif # meson.is_subproject() -- cgit v1.2.1