Skip to content
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

Jump to bottom

fix: Fix Meson include directories #532

Merged
merged 13 commits into from
Jun 21, 2024
Merged

fix: Fix Meson include directories #532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d30c244
fix: Fix Meson include directories
WillAyd Jun 18, 2024
ae6a6aa
Fix config file location
WillAyd Jun 18, 2024
34fdf09
Moved meson.build from src to src/nanoarrow
WillAyd Jun 19, 2024
b567c67
Update CMake configuration
WillAyd Jun 19, 2024
599fb3a
Update bundler
WillAyd Jun 20, 2024
9e96002
Add includes to CMake
WillAyd Jun 20, 2024
52b19ff
cleaner diff
WillAyd Jun 20, 2024
9c767be
Fix usage as subproject
WillAyd Jun 20, 2024
6ac1ba7
integration fix
WillAyd Jun 20, 2024
347bd52
Add Meson example test
WillAyd Jun 20, 2024
fe261d5
pip install meson
WillAyd Jun 20, 2024
3f34516
Add ninja-build
WillAyd Jun 21, 2024
147a8b1
ninja-build -> ninja
WillAyd Jun 21, 2024
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 meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ else
libtype = 'library'
endif

subdir('src')
subdir('src/nanoarrow')
incdir = include_directories('src/')

nanoarrow_lib = build_target(
Expand Down
2 changes: 1 addition & 1 deletion src/meson.build → src/nanoarrow/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ conf_data.set('NANOARROW_VERSION_MAJOR', ver_major)
conf_data.set('NANOARROW_VERSION_MINOR', ver_minor)
conf_data.set('NANOARROW_VERSION_PATCH', ver_patch)

configure_file(input: 'nanoarrow/nanoarrow_config.h.in',
configure_file(input: 'nanoarrow_config.h.in',
output: 'nanoarrow_config.h',
configuration: conf_data)
2 changes: 1 addition & 1 deletion src/nanoarrow/nanoarrow_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <stdint.h>
#include <string.h>

#include "nanoarrow_config.h"
#include <nanoarrow/nanoarrow_config.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include <nanoarrow/nanoarrow_config.h>
#include "nanoarrow/nanoarrow_config.h"

(Perhaps less correct, but more consistent with all the other places we currently do this)


#if defined(NANOARROW_DEBUG) && !defined(NANOARROW_PRINT_AND_DIE)
#include <stdio.h>
Expand Down
Loading