Merge pull request ceph#65970 from cbodley/wip-cmake-arrow-thrift-boost-jammy

cmake: BuildArrow.cmake uses bundled thrift if system version < 0.17

Reviewed-by: Kefu Chai <[email protected]>

Author: cbodley

cmake/modules/BuildArrow.cmake

@@ -16,7 +16,13 @@ function(build_arrow)
   list(APPEND arrow_CMAKE_ARGS -DARROW_JEMALLOC=OFF)
 
   # transitive dependencies
-  list(APPEND arrow_INTERFACE_LINK_LIBRARIES thrift)
+  if (thrift_VERSION VERSION_GREATER_EQUAL 0.17)
+    # build arrow with system thrift, and include the transitive dependency on the Arrow::Arrow target
+    list(APPEND arrow_INTERFACE_LINK_LIBRARIES thrift)
+  else()
+    # build arrow with bundled thrift to work around missing boost dependency
+    list(APPEND arrow_CMAKE_ARGS -DThrift_SOURCE=BUNDLED -DARROW_THRIFT_USE_SHARED=OFF)
+  endif()
 
   if (NOT WITH_SYSTEM_UTF8PROC)
     # forward utf8proc_ROOT from build_utf8proc()

cmake/modules/Findthrift.cmake

@@ -17,9 +17,19 @@ find_library(
   HINTS ${thrift_HOME} ENV thrift_HOME /usr/local /opt/local
   PATH_SUFFIXES lib lib64)
 
+if(thrift_INCLUDE_DIR)
+  file(READ "${thrift_INCLUDE_DIR}/thrift/config.h" THRIFT_CONFIG_H_CONTENT)
+  string(REGEX MATCH "#define PACKAGE_VERSION \"[0-9.]+\"" THRIFT_VERSION_DEFINITION
+	 "${THRIFT_CONFIG_H_CONTENT}")
+  string(REGEX MATCH "[0-9.]+" thrift_VERSION "${THRIFT_VERSION_DEFINITION}")
+  set(thrift_VERSION "${thrift_VERSION}" PARENT_SCOPE)
+endif()
+
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(thrift DEFAULT_MSG thrift_LIBRARIES
-                                  thrift_INCLUDE_DIR)
+find_package_handle_standard_args(
+  thrift
+  REQUIRED_VARS thrift_LIBRARIES thrift_INCLUDE_DIR
+  VERSION_VAR thrift_VERSION)
 mark_as_advanced(thrift_LIBRARIES thrift_INCLUDE_DIR)
 
 if(thrift_FOUND AND NOT (TARGET thrift::libthrift))