Skip to content

Feature/enable-standard-install #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeanbaptistelab wants to merge 4 commits into
base: master
Choose a base branch
from
+7 −9
Open

Feature/enable-standard-install #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
289cbcd
Update meson build to generate pkg-config files when installing
jeanbaptistelab Dec 4, 2025
fb9d552
Update to use meson installation tags
jeanbaptistelab Dec 4, 2025
52c9da1
Compile cleanly on both ARM and x86
jeanbaptistelab Dec 19, 2025
f3089f4
Use soname meson feature
jeanbaptistelab Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/csp/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
csp_config_h = configure_file(output: 'autoconfig.h', configuration: conf, install_dir: 'include/csp/')
csp_config_h = configure_file(output: 'autoconfig.h', configuration: conf, install_dir: 'include/csp/', install_tag: 'devel')
12 changes: 5 additions & 7 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,14 @@ csp_c_args = ['-Wshadow',
subdir('src')
subdir('include/csp')

if not meson.is_subproject()
install_subdir('include', install_dir : '.')
install_headers(csp_config_h, install_dir : 'include/csp')
endif


csp_lib = library('csp',
sources: [csp_sources, csp_config_h],
include_directories : csp_inc,
dependencies : csp_deps,
c_args : csp_c_args,
install : false,
install : true,
pic:true,
soversion: meson.project_version()
)

# The following dependency variable is for parent projects to link
Expand All @@ -89,6 +84,9 @@ csp_dep = declare_dependency(
link_with : csp_lib,
dependencies : csp_deps,
)
install_subdir('include', install_dir : '.', exclude_files: ['csp/meson.build'], install_tag: 'devel')
pkg = import('pkgconfig')
pkg.generate(csp_lib)

subdir('examples')

Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/csp_if_zmqhub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ int csp_zmqhub_init_filter2(const char * ifname, const char * host, uint16_t add
const ssize_t sec_key_len = sec_key ? strnlen(sec_key, CURVE_KEYLEN-1) : 0;
if (sec_key_len && sec_key_len != CURVE_KEYLEN-1) {
/* Is it bad to expose the detected length of the ZMQ key here? */
fprintf(stderr, "ZMQ secret key must be exactly 40 characters long (got %ld)\n", sec_key_len);
fprintf(stderr, "ZMQ secret key must be exactly 40 characters long (got %ld)\n", (signed long)sec_key_len);
return CSP_ERR_INVAL;
}

Expand Down
Loading