Skip to content

Commit

Permalink
fixup! add meson build
Browse files Browse the repository at this point in the history
  • Loading branch information
minijackson committed Apr 29, 2024
1 parent 4e33e85 commit a6d4f76
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
6 changes: 3 additions & 3 deletions example/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
foreach t : [
foreach e : [
['simplesrv', ['./simplesrv.cpp']],
['mailbox', ['./mailbox.cpp']],
['ticker', ['./ticker.cpp']],
Expand All @@ -8,8 +8,8 @@ foreach t : [
['rpc_client', ['./rpc_client.cpp']],
]
executable(
t[0],
t[1],
e[0],
e[1],
dependencies: [epics_base, libCom, pvxs_dep],
)
endforeach
1 change: 1 addition & 0 deletions ioc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ libpvxsIoc = library(
['./iochooks.cpp'],
cpp_args: ['-DPVXS_IOC_API_BUILDING'],
dependencies: [epics_base, libCom, pvxs_dep],
version: meson.project_version(),
install: true,
install_dir: lib_install_dir,
# HACK: Workaround https://github.com/mesonbuild/meson/issues/6541
Expand Down
3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ project(
version: '1.1.2',
license: 'EPICS',
# license_files: './LICENSE',
default_options: [
'default_library=both',
],
)

# Build Machine as in Autotools terminology: the machine that will build
Expand Down
1 change: 1 addition & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ libpvxs = library(
],
cpp_args: ['-DPVXS_API_BUILDING', '-DPVXS_ENABLE_EXPERT_API'],
dependencies: [epics_base, libCom, libevent],
version: meson.project_version(),
install: true,
install_dir: lib_install_dir,
# HACK: Workaround https://github.com/mesonbuild/meson/issues/6541
Expand Down
8 changes: 4 additions & 4 deletions test/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ if epics_version[0] == '7' and epics_version[1] == '0'
endif

# Development utilities, not tests
foreach t : [
foreach e : [
['mcat', ['./mcat.cpp']],
['spam', ['./spam.cpp']],
['eatspam', ['./eatspam.cpp']],
]
test = executable(
t[0],
t[1],
executable(
e[0],
e[1],
dependencies: [epics_base, libCom, pvxs_dep],
)
endforeach

0 comments on commit a6d4f76

Please sign in to comment.