mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-28 16:47:19 +08:00
Code Activity

[GLib] Support arrow-cuda.pc in build directory

Browse Source
This commit is contained in:
Kouhei Sutou committed 2018-12-06 10:03:06 +09:00
1 parent 32381216de
commit d16eb7133b
2 files changed
+12 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

c_glib/configure.ac
+10
View File
@@ -115,6 +115,7 @@ AC_ARG_WITH(arrow-cpp-build-type,
[GARROW_ARROW_CPP_BUILD_TYPE="$withval"],
[GARROW_ARROW_CPP_BUILD_TYPE="release"])
ARROW_CUDA_PKG_CONFIG_PATH=""
AC_ARG_WITH(arrow-cpp-build-dir,
[AS_HELP_STRING([--with-arrow-cpp-build-dir=PATH],
[Use this option to build with not installed Arrow C++])],
@@ -172,12 +173,15 @@ else
if test -f "${GARROW_ARROW_CPP_BUILD_DIR}/src/arrow/gpu/arrow-cuda.pc"; then
HAVE_ARROW_CUDA=yes
ARROW_CUDA_LIBS="-larrow_cuda"
ARROW_CUDA_PKG_CONFIG_PATH="\$(ARROW_BUILD_DIR)/src/arrow/gpu"
else
HAVE_ARROW_CUDA=no
ARROW_CUDA_LIBS=""
ARROW_CUDA_PKG_CONFIG_PATH=""
fi
AC_SUBST(ARROW_CUDA_CFLAGS)
AC_SUBST(ARROW_CUDA_LIBS)
AC_SUBST(ARROW_CUDA_PKG_CONFIG_PATH)
GANDIVA_CFLAGS=""
if test -f "${GARROW_ARROW_CPP_BUILD_DIR}/src/gandiva/gandiva.pc"; then
@@ -224,11 +228,17 @@ fi
AM_CONDITIONAL([HAVE_ARROW_CUDA], [test "$HAVE_ARROW_CUDA" = "yes"])
if test "$HAVE_ARROW_CUDA" = "yes"; then
ARROW_CUDA_GLIB_PACKAGE="arrow-cuda-glib"
PLASMA_ARROW_CUDA_PKG_CONFIG_PATH=":\$(abs_top_builddir)/arrow-cuda-glib"
if test -n "${ARROW_CUDA_PKG_CONFIG_PATH}"; then
PLASMA_ARROW_CUDA_PKG_CONFIG_PATH=":${ARROW_CUDA_PKG_CONFIG_PATH}${PLASMA_ARROW_CUDA_PKG_CONFIG_PATH}"
fi
AC_DEFINE(HAVE_ARROW_CUDA, [1], [Define to 1 if Apache Arrow supports CUDA.])
else
ARROW_CUDA_GLIB_PACKAGE=""
PLASMA_ARROW_CUDA_PKG_CONFIG_PATH=""
fi
AC_SUBST(ARROW_CUDA_GLIB_PACKAGE)
AC_SUBST(PLASMA_ARROW_CUDA_PKG_CONFIG_PATH)
AM_CONDITIONAL([HAVE_GANDIVA], [test "$HAVE_GANDIVA" = "yes"])
if test "$HAVE_GANDIVA" = "yes"; then
c_glib/plasma-glib/Makefile.am
+2 -5
View File
@@ -32,7 +32,6 @@ AM_CFLAGS = \
$(GPLASMA_CFLAGS)
PLASMA_ARROW_CUDA_LIBS =
PLASMA_ARROW_CUDA_GLIB_PKG_CONFIG_PATH =
PLASMA_INTROSPECTION_COMPILER_ARROW_CUDA_ARGS =
PLASMA_GIR_ARROW_CUDA_PACKAGE =
PLASMA_GIR_ARROW_CUDA_SCANNER_ADD_INCLUDE_PATH =
@@ -43,8 +42,6 @@ if HAVE_ARROW_CUDA
PLASMA_ARROW_CUDA_LIBS += \
$(ARROW_CUDA_LIBS) \
../arrow-cuda-glib/libarrow-cuda-glib.la
PLASMA_ARROW_CUDA_GLIB_PKG_CONFIG_PATH += \
:${abs_top_builddir}/arrow-cuda-glib
PLASMA_INTROSPECTION_COMPILER_ARROW_CUDA_ARGS += \
--includedir=$(abs_top_builddir)/arrow-cuda-glib
PLASMA_GIR_ARROW_CUDA_PACKAGE += \
@@ -117,10 +114,10 @@ INTROSPECTION_SCANNER_ARGS =
INTROSPECTION_SCANNER_ENV =
if USE_ARROW_BUILD_DIR
INTROSPECTION_SCANNER_ENV += \
PKG_CONFIG_PATH=${abs_top_builddir}/arrow-glib$(PLASMA_ARROW_CUDA_GLIB_PKG_CONFIG_PATH):$(ARROW_BUILD_DIR)/src/arrow:$${PKG_CONFIG_PATH}
PKG_CONFIG_PATH=$(abs_top_builddir)/arrow-glib$(PLASMA_ARROW_CUDA_PKG_CONFIG_PATH):$(ARROW_BUILD_DIR)/src/arrow:$${PKG_CONFIG_PATH}
else
INTROSPECTION_SCANNER_ENV += \
PKG_CONFIG_PATH=${abs_top_builddir}/arrow-glib$(PLASMA_ARROW_CUDA_GLIB_PKG_CONFIG_PATH):$${PKG_CONFIG_PATH}
PKG_CONFIG_PATH=$(abs_top_builddir)/arrow-glib$(PLASMA_ARROW_CUDA_PKG_CONFIG_PATH):$${PKG_CONFIG_PATH}
endif
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(abs_top_builddir)/arrow-glib \