Skip to content

Commit

Permalink
Update pkgconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
lleyton committed Jan 1, 2023
1 parent 0bcdd91 commit 515dbb3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 5 additions & 2 deletions demo/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ subproject('blueprint-compiler')

conf = configuration_data()
conf.set_quoted('APP_ID', 'co.tauos.Helium1.Demo')
conf.set_quoted('VERSION', '1.1.0')
conf.set_quoted('VERSION', '1.2.5')
conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
configure_file(output: 'config.h', configuration: conf)
config_h_dir = include_directories('.')

example_deps = libhelium_deps
example_deps += dependency('libbismuth-1', fallback: [ 'libbismuth', 'libbismuth_dep' ], version: '>=1.0.0')

example_sources = files(
'src/main.vala',
'src/window.vala',
Expand All @@ -18,7 +21,7 @@ executable(
'co.tauos.Helium1.Demo',
helium_demo_resources,
sources: example_sources,
dependencies: libhelium_dep,
dependencies: example_deps,
vala_args: [meson.project_source_root() + '/demo/src/config.vapi'],
install: true,
)
3 changes: 1 addition & 2 deletions lib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,8 @@ libhelium = library(
pkg = import('pkgconfig')
pkg.generate(
libhelium,
requires: ['gtk4', 'libbismuth-1'],
requires: ['gtk4'],
description: 'tauOS\'s Application Framework',
version: '1',
url: 'https://github.com/tau-OS/libhelium',
)

Expand Down
5 changes: 2 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'vala', 'c',
license: 'GPL-3-or-later',
meson_version: '>= 0.56.0',
version: '1.1.0',
version: '1.2.5',
default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
)

Expand Down Expand Up @@ -33,8 +33,7 @@ libhelium_deps = [
dependency('glib-2.0', version: '>=' + glib_min_version),
dependency('gobject-2.0', version: '>=' + glib_min_version),
dependency('gee-0.8'),
dependency('gtk4', version: '>=4.4'),
dependency('libbismuth-1', fallback: [ 'libbismuth', 'libbismuth_dep' ], version: '>=1.0.0'),
dependency('gtk4', version: '>=4.4')
]

pkgconfig = import('pkgconfig')
Expand Down

0 comments on commit 515dbb3

Please sign in to comment.