You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/04/27 02:51:19 UTC
[arrow] branch master updated: ARROW-16352: [GLib] Fix wrong enums.h install location
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new de8bf493a6 ARROW-16352: [GLib] Fix wrong enums.h install location
de8bf493a6 is described below
commit de8bf493a63359d5a430d59a8def8fb4188285fb
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Wed Apr 27 11:51:10 2022 +0900
ARROW-16352: [GLib] Fix wrong enums.h install location
Closes #13006 from kou/glib-dataset-fix-wrong-install-path
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
c_glib/arrow-dataset-glib/enums.h.template | 2 +-
c_glib/arrow-dataset-glib/meson.build | 2 +-
c_glib/arrow-glib/enums.h.template | 2 +-
c_glib/arrow-glib/meson.build | 2 +-
c_glib/gandiva-glib/enums.h.template | 2 +-
c_glib/gandiva-glib/meson.build | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/c_glib/arrow-dataset-glib/enums.h.template b/c_glib/arrow-dataset-glib/enums.h.template
index d6a0a455f5..b7d3c99c0b 100644
--- a/c_glib/arrow-dataset-glib/enums.h.template
+++ b/c_glib/arrow-dataset-glib/enums.h.template
@@ -20,7 +20,7 @@
#pragma once
-#include <arrow-dataset-glib/partitioning.h>
+#include <glib-object.h>
G_BEGIN_DECLS
/*** END file-header ***/
diff --git a/c_glib/arrow-dataset-glib/meson.build b/c_glib/arrow-dataset-glib/meson.build
index 0d9b8564ec..1658d06574 100644
--- a/c_glib/arrow-dataset-glib/meson.build
+++ b/c_glib/arrow-dataset-glib/meson.build
@@ -52,7 +52,7 @@ enums = gnome.mkenums('enums',
symbol_prefix: 'gadataset',
c_template: 'enums.c.template',
h_template: 'enums.h.template',
- install_dir: join_paths(include_dir, meson.project_name()),
+ install_dir: join_paths(include_dir, 'arrow-dataset-glib'),
install_header: true)
enums_source = enums[0]
enums_header = enums[1]
diff --git a/c_glib/arrow-glib/enums.h.template b/c_glib/arrow-glib/enums.h.template
index 3509ed2e90..b7d3c99c0b 100644
--- a/c_glib/arrow-glib/enums.h.template
+++ b/c_glib/arrow-glib/enums.h.template
@@ -20,7 +20,7 @@
#pragma once
-#include <arrow-glib/error.h>
+#include <glib-object.h>
G_BEGIN_DECLS
/*** END file-header ***/
diff --git a/c_glib/arrow-glib/meson.build b/c_glib/arrow-glib/meson.build
index 73aa811138..c87a3250d9 100644
--- a/c_glib/arrow-glib/meson.build
+++ b/c_glib/arrow-glib/meson.build
@@ -213,7 +213,7 @@ enums = gnome.mkenums('enums',
symbol_prefix: 'garrow',
c_template: 'enums.c.template',
h_template: 'enums.h.template',
- install_dir: join_paths(include_dir, meson.project_name()),
+ install_dir: join_paths(include_dir, 'arrow-glib'),
install_header: true)
enums_source = enums[0]
enums_header = enums[1]
diff --git a/c_glib/gandiva-glib/enums.h.template b/c_glib/gandiva-glib/enums.h.template
index 8d7b463037..b7d3c99c0b 100644
--- a/c_glib/gandiva-glib/enums.h.template
+++ b/c_glib/gandiva-glib/enums.h.template
@@ -20,7 +20,7 @@
#pragma once
-#include <glib.h>
+#include <glib-object.h>
G_BEGIN_DECLS
/*** END file-header ***/
diff --git a/c_glib/gandiva-glib/meson.build b/c_glib/gandiva-glib/meson.build
index 5127d67afc..8d811693f2 100644
--- a/c_glib/gandiva-glib/meson.build
+++ b/c_glib/gandiva-glib/meson.build
@@ -69,7 +69,7 @@ enums = gnome.mkenums('enums',
symbol_prefix: 'ggandiva',
c_template: 'enums.c.template',
h_template: 'enums.h.template',
- install_dir: join_paths(include_dir, meson.project_name()),
+ install_dir: join_paths(include_dir, 'gandiva-glib'),
install_header: true)
enums_source = enums[0]
enums_header = enums[1]