You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "WillAyd (via GitHub)" <gi...@apache.org> on 2025/02/07 14:54:38 UTC
Re: [PR] GH-45447: [CI][GLib] Use `meson format` for Meson configuration files [arrow]
WillAyd commented on code in PR #45448:
URL: https://github.com/apache/arrow/pull/45448#discussion_r1946658718
##########
c_glib/arrow-cuda-glib/meson.build:
##########
@@ -17,88 +17,91 @@
# specific language governing permissions and limitations
# under the License.
-sources = files(
- 'cuda.cpp',
-)
+sources = files('cuda.cpp')
-c_headers = files(
- 'arrow-cuda-glib.h',
- 'cuda.h',
-)
+c_headers = files('arrow-cuda-glib.h', 'cuda.h')
-cpp_headers = files(
- 'arrow-cuda-glib.hpp',
- 'cuda.hpp',
-)
+cpp_headers = files('arrow-cuda-glib.hpp', 'cuda.hpp')
version_h = configure_file(
- input: 'version.h.in',
- output: 'version.h',
- command: [python3, generate_version_header_py, '--library', 'GARROW_CUDA', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+ input: 'version.h.in',
+ output: 'version.h',
+ command: [
+ python3,
+ generate_version_header_py,
+ '--library',
+ 'GARROW_CUDA',
+ '--version',
+ version,
+ '--input',
+ '@INPUT@',
+ '--output',
+ '@OUTPUT@',
+ ],
)
c_headers += version_h
headers = c_headers + cpp_headers
install_headers(headers, subdir: 'arrow-cuda-glib')
-dependencies = [
- arrow_cuda,
- arrow_glib,
-]
-libarrow_cuda_glib = library('arrow-cuda-glib',
- sources: sources,
- install: true,
- dependencies: dependencies,
- implicit_include_directories: false,
- include_directories: base_include_directories,
- cpp_args: ['-DGARROW_CUDA_COMPILATION'],
- soversion: so_version,
- version: library_version)
-arrow_cuda_glib = declare_dependency(link_with: libarrow_cuda_glib,
- include_directories: base_include_directories,
- dependencies: dependencies)
+dependencies = [arrow_cuda, arrow_glib]
+libarrow_cuda_glib = library(
+ 'arrow-cuda-glib',
+ sources: sources,
+ install: true,
+ dependencies: dependencies,
+ implicit_include_directories: false,
+ include_directories: base_include_directories,
+ cpp_args: ['-DGARROW_CUDA_COMPILATION'],
+ soversion: so_version,
+ version: library_version,
+)
+arrow_cuda_glib = declare_dependency(
+ link_with: libarrow_cuda_glib,
+ include_directories: base_include_directories,
+ dependencies: dependencies,
+)
if target_machine.system() != 'windows'
- pkgconfig.generate(libarrow_cuda_glib,
- description: 'C API for Apache Arrow CUDA based on GLib',
- filebase: 'arrow-cuda-glib',
- name: 'Apache Arrow CUDA GLib',
- requires: ['arrow-glib', 'arrow-cuda'],
- variables: pkgconfig_variables,
- version: version)
+ pkgconfig.generate(
+ libarrow_cuda_glib,
+ description: 'C API for Apache Arrow CUDA based on GLib',
+ filebase: 'arrow-cuda-glib',
+ name: 'Apache Arrow CUDA GLib',
+ requires: ['arrow-glib', 'arrow-cuda'],
+ variables: pkgconfig_variables,
+ version: version,
+ )
endif
if have_gi
- gir_dependencies = [
- declare_dependency(sources: arrow_glib_gir),
- ]
- gir_extra_args = [
- '--warn-all',
- '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
- ]
- arrow_cuda_glib_gir = \
- gnome.generate_gir(libarrow_cuda_glib,
- dependencies: gir_dependencies,
- export_packages: 'arrow-cuda-glib',
- extra_args: gir_extra_args,
- header: 'arrow-cuda-glib/arrow-cuda-glib.h',
- identifier_prefix: 'GArrowCUDA',
- includes: [
- 'Arrow-1.0',
- ],
- kwargs: generate_gi_common_args,
- namespace: 'ArrowCUDA',
- sources: sources + c_headers,
- symbol_prefix: 'garrow_cuda')
+ gir_dependencies = [declare_dependency(sources: arrow_glib_gir)]
+ gir_extra_args = [
+ '--warn-all',
+ '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+ ]
+ arrow_cuda_glib_gir = \
+ gnome.generate_gir(
Review Comment:
Nice catch - done!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org