This is an automated email from the ASF dual-hosted git repository.
apitrou 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 2d3046f ARROW-10011: [C++] Make FindRE2.cmake re-entrant
2d3046f is described below
commit 2d3046f2eefd0e79819e15286b17c89b1ec1c8e2
Author: Uwe L. Korn <[email protected]>
AuthorDate: Tue Sep 15 12:17:17 2020 +0200
ARROW-10011: [C++] Make FindRE2.cmake re-entrant
Closes #8192 from xhochy/ARROW-10011
Authored-by: Uwe L. Korn <[email protected]>
Signed-off-by: Antoine Pitrou <[email protected]>
---
cpp/cmake_modules/FindRE2.cmake | 17 +++++++++++++----
r/man/RecordBatch.Rd | 3 +--
r/man/Table.Rd | 3 +--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/cpp/cmake_modules/FindRE2.cmake b/cpp/cmake_modules/FindRE2.cmake
index 4562e3a..645a20f 100644
--- a/cpp/cmake_modules/FindRE2.cmake
+++ b/cpp/cmake_modules/FindRE2.cmake
@@ -63,8 +63,17 @@ endif()
find_package_handle_standard_args(RE2 REQUIRED_VARS RE2_LIB RE2_INCLUDE_DIR)
if(RE2_FOUND)
- add_library(RE2::re2 UNKNOWN IMPORTED)
- set_target_properties(RE2::re2
- PROPERTIES IMPORTED_LOCATION "${RE2_LIB}"
- INTERFACE_INCLUDE_DIRECTORIES
"${RE2_INCLUDE_DIR}")
+ if(NOT TARGET RE2::re2)
+ add_library(RE2::re2 UNKNOWN IMPORTED)
+ set_target_properties(RE2::re2
+ PROPERTIES IMPORTED_LOCATION "${RE2_LIB}"
+ INTERFACE_INCLUDE_DIRECTORIES
"${RE2_INCLUDE_DIR}")
+ endif()
+ # Some third-party dependencies (namely gRPC) are on the look-out for a
lower-case re2 Target.
+ if(NOT TARGET re2::re2)
+ add_library(re2::re2 UNKNOWN IMPORTED)
+ set_target_properties(re2::re2
+ PROPERTIES IMPORTED_LOCATION "${RE2_LIB}"
+ INTERFACE_INCLUDE_DIRECTORIES
"${RE2_INCLUDE_DIR}")
+ endif()
endif()
diff --git a/r/man/RecordBatch.Rd b/r/man/RecordBatch.Rd
index 1cf70a0..c9cdb34 100644
--- a/r/man/RecordBatch.Rd
+++ b/r/man/RecordBatch.Rd
@@ -48,8 +48,7 @@ the following R6 methods that map onto the underlying C++
methods:
\item \verb{$names()}: Get all column names (called by \code{names(batch)})
\item \verb{$GetColumnByName(name)}: Extract an \code{Array} by string name
\item \verb{$RemoveColumn(i)}: Drops a column from the batch by integer
position
-\item \verb{$selectColumns(indices)}: Return a new record batch with a
selection of columns. Supports
-0-based integer indices and character vectors.
+\item \verb{$selectColumns(indices)}: Return a new record batch with a
selection of columns, expressed as 0-based integers.
\item \verb{$Slice(offset, length = NULL)}: Create a zero-copy view starting
at the
indicated integer offset and going for the given length, or to the end
of the table if \code{NULL}, the default.
diff --git a/r/man/Table.Rd b/r/man/Table.Rd
index e53cba6..18c7da1 100644
--- a/r/man/Table.Rd
+++ b/r/man/Table.Rd
@@ -46,8 +46,7 @@ the following R6 methods that map onto the underlying C++
methods:
\item \verb{$ColumnNames()}: Get all column names (called by \code{names(tab)})
\item \verb{$GetColumnByName(name)}: Extract a \code{ChunkedArray} by string
name
\item \verb{$field(i)}: Extract a \code{Field} from the table schema by
integer position
-\item \verb{$SelectColumns(indices)}: Return new \code{Table} with specified
columns. Supports
-0-based integer indices and character vectors.
+\item \verb{$SelectColumns(indices)}: Return new \code{Table} with specified
columns, expressed as 0-based integers.
\item \verb{$Slice(offset, length = NULL)}: Create a zero-copy view starting
at the
indicated integer offset and going for the given length, or to the end
of the table if \code{NULL}, the default.
