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]>
apache · Sep 15, 2020 · 2d3046f · 2d3046f
1 parent 49e5b46
commit 2d3046f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git 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
diff --git a/r/man/Table.Rd b/r/man/Table.Rd