Skip to content

Commit 61dc743

Browse files
authored
fix: Meson install header files and pkgconfig (#542)
1 parent 749349d commit 61dc743

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ if(NANOARROW_IPC)
236236
$<INSTALL_INTERFACE:include>)
237237

238238
install(TARGETS nanoarrow_ipc DESTINATION lib)
239-
install(FILES src/nanoarrow/nanoarrow_ipc.h
240-
src/nanoarrow/nanoarrow_ipc_flatcc_generated.h
239+
install(FILES src/nanoarrow/nanoarrow_ipc.h src/nanoarrow/ipc/flatcc_generated.h
241240
DESTINATION include/nanoarrow)
242241
endif()
243242

meson.build

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,19 @@ endif
4343
subdir('src/nanoarrow')
4444
incdir = include_directories('src/')
4545

46+
install_headers(
47+
'src/nanoarrow/nanoarrow.h',
48+
'src/nanoarrow/nanoarrow.hpp',
49+
subdir: 'nanoarrow',
50+
)
51+
52+
install_headers(
53+
'src/nanoarrow/common/inline_array.h',
54+
'src/nanoarrow/common/inline_buffer.h',
55+
'src/nanoarrow/common/inline_types.h',
56+
subdir: 'nanoarrow/common',
57+
)
58+
4659
nanoarrow_lib = library(
4760
'nanoarrow',
4861
'src/nanoarrow/common/array.c',
@@ -60,6 +73,12 @@ nanoarrow_dep = declare_dependency(include_directories: [incdir],
6073
if get_option('ipc')
6174
flatcc_dep = dependency('flatcc')
6275

76+
install_headers(
77+
'src/nanoarrow/nanoarrow_ipc.h',
78+
'src/nanoarrow/ipc/flatcc_generated.h',
79+
subdir: 'nanoarrow'
80+
)
81+
6382
nanoarrow_ipc_lib = library(
6483
'nanoarrow_ipc',
6584
'src/nanoarrow/ipc/decoder.c',
@@ -91,6 +110,11 @@ if needs_device
91110
error('CUDA support with the Meson build system is not implemented')
92111
endif
93112

113+
install_headers(
114+
'src/nanoarrow/nanoarrow_device.h',
115+
subdir: 'nanoarrow',
116+
)
117+
94118
nanoarrow_device_lib = library(
95119
'nanoarrow_device',
96120
sources: device_srcs,
@@ -250,3 +274,6 @@ if get_option('apps')
250274
)
251275
endif
252276
endif
277+
278+
pkg = import('pkgconfig')
279+
pkg.generate(nanoarrow_lib)

src/nanoarrow/meson.build

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ conf_data.set('NANOARROW_VERSION_MAJOR', ver_major)
3535
conf_data.set('NANOARROW_VERSION_MINOR', ver_minor)
3636
conf_data.set('NANOARROW_VERSION_PATCH', ver_patch)
3737

38-
configure_file(input: 'nanoarrow_config.h.in',
39-
output: 'nanoarrow_config.h',
40-
configuration: conf_data)
38+
configure_file(
39+
input: 'nanoarrow_config.h.in',
40+
output: 'nanoarrow_config.h',
41+
configuration: conf_data,
42+
install: true,
43+
install_dir: get_option('includedir') / 'nanoarrow',
44+
)

0 commit comments

Comments
 (0)