Skip to content

Commit d6e4eb9

Browse files
authored
Merge pull request #690 from ssahani/ci
Refactor meson
2 parents 24a7b57 + 65f2fbf commit d6e4eb9

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

meson.build

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
project('network-config-manager', 'c',
2-
version : '0.7.2',
2+
version : '0.7.3',
33
license : 'Apache-2.0',
44
default_options: [
5-
'c_std=gnu99',
5+
'c_std=gnu11',
6+
'prefix=/usr',
7+
'sysconfdir=/etc',
68
'localstatedir=/var',
9+
'warning_level=2',
710
],
811
meson_version : '>= 0.40')
912

1013
so_version = '1'
1114

1215
conf = configuration_data()
16+
conf.set_quoted('PROJECT_URL', 'https://github.com/vmware/network-config-manager')
17+
conf.set('PROJECT_VERSION', meson.project_version().split('~')[0],
18+
description : 'Numerical project version (used where a simple number is expected)')
19+
conf.set_quoted('PROJECT_VERSION_FULL', meson.project_version(), description : 'Full project version')
20+
1321
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
1422
conf.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
1523

1624
substs = configuration_data()
25+
1726
substs.set('PACKAGE_URL', 'https://github.com/vmware/network-config-manager')
18-
substs.set('PACKAGE_VERSION', meson.project_version())
1927
conf.set_quoted('PKGSYSCONFDIR', get_option('sysconfdir'))
2028

2129
#####################################################################
@@ -144,7 +152,7 @@ includes = include_directories('src/ctl',
144152
'.')
145153

146154
if want_nftables
147-
network_config_managerlib = library('network_config_managerlib',
155+
network_config_managerlib = library('network_config_manager',
148156
network_config_manager_sources,
149157
include_directories: includes,
150158
dependencies : [
@@ -153,7 +161,7 @@ if want_nftables
153161
version: meson.project_version(),
154162
soversion: so_version)
155163
else
156-
network_config_managerlib = library('network_config_managerlib',
164+
network_config_managerlib = library('network_config_manager',
157165
network_config_manager_sources,
158166
include_directories: includes,
159167
dependencies : [

0 commit comments

Comments
 (0)