Skip to content

Commit

Permalink
apacheGH-43591: [C++][GLib] Don't install arrow-cuda.pc/arrow-cuda-gl…
Browse files Browse the repository at this point in the history
…ib.pc on Windows (apache#43593)

### Rationale for this change

Because `cuda.pc` that is required by `arrow-cuda.pc` doesn't exist on Windows.

### What changes are included in this PR?

Don't install `arrow-cuda.pc`/`arrow-cuda-glib.pc` on Windows. Users should use ArrowCUDA CMake package instead of pkg-config on Windows. 

### Are these changes tested?

Yes.

### Are there any user-facing changes?

No.
* GitHub Issue: apache#43591

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
  • Loading branch information
kou authored Aug 10, 2024
1 parent e0c8c39 commit 493f08c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
17 changes: 9 additions & 8 deletions c_glib/arrow-cuda-glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,15 @@ libarrow_cuda_glib = library('arrow-cuda-glib',
arrow_cuda_glib = declare_dependency(link_with: libarrow_cuda_glib,
include_directories: base_include_directories,
dependencies: dependencies)

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)
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)
endif

if have_gi
gir_dependencies = [
Expand Down
7 changes: 5 additions & 2 deletions cpp/src/arrow/gpu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,14 @@ endif()

set(ARROW_CUDA_SRCS cuda_arrow_ipc.cc cuda_context.cc cuda_internal.cc cuda_memory.cc)

set(ARROW_CUDA_PKG_CONFIG_NAME_ARGS)
if(NOT WINDOWS)
list(APPEND ARROW_CUDA_PKG_CONFIG_NAME_ARGS PKG_CONFIG_NAME arrow-cuda)
endif()
add_arrow_lib(arrow_cuda
CMAKE_PACKAGE_NAME
ArrowCUDA
PKG_CONFIG_NAME
arrow-cuda
${ARROW_CUDA_PKG_CONFIG_NAME_ARGS}
SOURCES
${ARROW_CUDA_SRCS}
OUTPUTS
Expand Down

0 comments on commit 493f08c

Please sign in to comment.