X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=fa6d40f5967723352192b7579a90f26c1fc4ac47;hb=f22a41cb05c5cc1bbe8ce391fa918707138afad3;hp=2ee9fb6cae6f932e3e693e81e76371f98e7f6592;hpb=1bdddb491b84534172de4de9a9b171c6c46831b1;p=nageru diff --git a/meson.build b/meson.build index 2ee9fb6..fa6d40f 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0') +project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.1') cxx = meson.get_compiler('cpp') qt5 = import('qt5') @@ -159,9 +159,9 @@ endif # Protobuf compilation. gen = generator(protoc, \ output : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'], - arguments : ['--proto_path=@CURRENT_SOURCE_DIR@/nageru', '--cpp_out=@BUILD_DIR@', '@INPUT@']) -proto_generated = gen.process(['nageru/state.proto', 'nageru/midi_mapping.proto', 'nageru/json.proto']) -protobuf_lib = static_library('protobufs', proto_generated, dependencies: nageru_deps, include_directories: nageru_include_dirs) + arguments : ['--proto_path=@CURRENT_SOURCE_DIR@/nageru', '--cpp_out=@BUILD_DIR@', '-I@CURRENT_SOURCE_DIR@/shared', '@INPUT@']) +proto_generated = gen.process(['nageru/state.proto', 'nageru/json.proto', 'nageru/nageru_midi_mapping.proto']) +protobuf_lib = static_library('nageru_protobufs', proto_generated, dependencies: nageru_deps, include_directories: nageru_include_dirs) protobuf_hdrs = declare_dependency(sources: proto_generated) nageru_link_with += protobuf_lib