From 84296312ba9a00ab11a56ea210e3b14d061a9db3 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Tue, 26 Sep 2023 20:37:01 -0700
Subject: [PATCH] [arrow] Add Flight findpackage (#33934)

* [arrow] Add Flight findpackage

* update version

* apply suggesstion

* update version

---------

Co-authored-by: Zhao Liu <v-zhli17@microsoft.com>
---
 ports/arrow/portfile.cmake | 13 +++++++++++++
 ports/arrow/usage-flight   |  3 +++
 ports/arrow/vcpkg.json     |  1 +
 versions/a-/arrow.json     |  5 +++++
 versions/baseline.json     |  2 +-
 5 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 ports/arrow/usage-flight

diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
index 1ee7a81efa..eed1698ce5 100644
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@@ -88,6 +88,14 @@ if("acero" IN_LIST FEATURES)
     )
 endif()
 
+if("flight" IN_LIST FEATURES)
+    vcpkg_cmake_config_fixup(
+        PACKAGE_NAME ArrowFlight
+        CONFIG_PATH lib/cmake/ArrowFlight
+        DO_NOT_DELETE_PARENT_CONFIG_PATH
+    )
+endif()
+
 if("parquet" IN_LIST FEATURES)
     vcpkg_cmake_config_fixup(
         PACKAGE_NAME parquet
@@ -111,6 +119,11 @@ if("acero" IN_LIST FEATURES)
     file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-acero}")
 endif()
 
+if("flight" IN_LIST FEATURES)
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-flight" usage-flight)
+    file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-flight}")
+endif()
+
 if("example" IN_LIST FEATURES)
     file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example")
 endif()
diff --git a/ports/arrow/usage-flight b/ports/arrow/usage-flight
new file mode 100644
index 0000000000..69abcf6c0c
--- /dev/null
+++ b/ports/arrow/usage-flight
@@ -0,0 +1,3 @@
+
+    find_package(ArrowFlight CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE "$<IF:$<BOOL:${ARROW_BUILD_STATIC}>,ArrowFlight::arrow_flight_static,ArrowFlight::arrow_flight_shared>")
diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
index f467e37715..e2432e5d37 100644
--- a/ports/arrow/vcpkg.json
+++ b/ports/arrow/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "arrow",
   "version": "13.0.0",
+  "port-version": 1,
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",
   "license": "Apache-2.0",
diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json
index f0ac8dc404..adedd7fa68 100644
--- a/versions/a-/arrow.json
+++ b/versions/a-/arrow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "58708e6a9ecca81874ff79869e9006d42ca2bbfe",
+      "version": "13.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ef87d769431fcefcb1d2864a9266cba168602fa2",
       "version": "13.0.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 87ada4ad1c..40da406232 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -234,7 +234,7 @@
     },
     "arrow": {
       "baseline": "13.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "arsenalgear": {
       "baseline": "2.1.0",