Skip to content

Commit 149072b

Browse files
committed
cppzmq: generate .pc file with pkg-config module
It's less error-prone to use Meson's module rather than upstream's template.
1 parent 5dbb8b3 commit 149072b

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

releases.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,7 @@
585585
"cppzmq"
586586
],
587587
"versions": [
588+
"4.10.0-4",
588589
"4.10.0-3",
589590
"4.10.0-2",
590591
"4.10.0-1",

subprojects/packagefiles/cppzmq/meson.build

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,23 @@ project(
33
'cpp',
44
version: '4.10.0',
55
license: 'MIT',
6-
meson_version: '>=0.60.0',
6+
meson_version: '>=0.49.0',
77
)
88

9-
libzmq_dep = dependency('libzmq')
9+
deps = [dependency('libzmq')]
1010

1111
cppzmq_dep = declare_dependency(
1212
include_directories: include_directories('.'),
13-
dependencies: libzmq_dep,
13+
dependencies: deps,
1414
)
1515

1616
# install
1717
install_headers('zmq.hpp', 'zmq_addon.hpp')
18-
conf_data = configuration_data()
19-
conf_data.set('CMAKE_INSTALL_PREFIX', get_option('prefix'))
20-
conf_data.set(
21-
'CMAKE_INSTALL_FULL_INCLUDEDIR',
22-
get_option('prefix') / get_option('includedir'),
23-
)
24-
conf_data.set('PROJECT_NAME', meson.project_name())
25-
conf_data.set('PROJECT_VERSION', meson.project_version())
26-
conf_data.set('pkg_config_defines', '')
27-
configure_file(
28-
input: 'cppzmq.pc.in',
29-
output: 'cppzmq.pc',
30-
configuration: conf_data,
31-
install: true,
32-
install_tag: 'devel',
18+
import('pkgconfig').generate(
19+
name: meson.project_name(),
20+
description: 'C++ binding for libzmq',
21+
url: 'https://github.com/zeromq/cppzmq',
22+
requires: deps,
3323
install_dir: get_option('datadir') / 'pkgconfig',
3424
)
3525

0 commit comments

Comments
 (0)