@@ -249,8 +249,12 @@ macro(build_fmt)
249249 string (REPLACE "-Werror" "" FMT_CMAKE_CXX_FLAGS ${FMT_CMAKE_CXX_FLAGS} )
250250
251251 set (FMT_CMAKE_ARGS
252- ${EP_COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FMT_PREFIX}
253- "-DCMAKE_CXX_FLAGS=${FMT_CMAKE_CXX_FLAGS} " "-DCMAKE_C_FLAGS=${FMT_CMAKE_C_FLAGS} " )
252+ ${EP_COMMON_CMAKE_ARGS}
253+ -DCMAKE_INSTALL_PREFIX=${FMT_PREFIX}
254+ "-DCMAKE_CXX_FLAGS=${FMT_CMAKE_CXX_FLAGS} "
255+ "-DCMAKE_C_FLAGS=${FMT_CMAKE_C_FLAGS} "
256+ -DFMT_TEST=OFF
257+ -DFMT_DOC=OFF )
254258 set (FMT_CONFIGURE CMAKE_ARGS ${FMT_CMAKE_ARGS} )
255259 externalproject_add (fmt_ep
256260 URL ${FMT_SOURCE_URL}
@@ -337,7 +341,8 @@ macro(build_zstd)
337341 -DCMAKE_INSTALL_PREFIX=${ZSTD_PREFIX}
338342 "-DCMAKE_CXX_FLAGS=${ZSTD_CMAKE_CXX_FLAGS} "
339343 "-DCMAKE_C_FLAGS=${ZSTD_CMAKE_C_FLAGS} "
340- -DZSTD_BUILD_SHARED=OFF )
344+ -DZSTD_BUILD_SHARED=OFF
345+ -DZSTD_BUILD_PROGRAMS=OFF )
341346
342347 set (ZSTD_CONFIGURE SOURCE_SUBDIR "build/cmake" CMAKE_ARGS ${ZSTD_CMAKE_ARGS} )
343348 externalproject_add (zstd_ep
@@ -363,7 +368,8 @@ macro(build_lz4)
363368 "${LZ4_PREFIX} /lib/${CMAKE_STATIC_LIBRARY_PREFIX} lz4${CMAKE_STATIC_LIBRARY_SUFFIX} "
364369 )
365370 set (LZ4_LIBRARIES ${LZ4_STATIC_LIB} )
366- set (LZ4_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${LZ4_PREFIX} )
371+ set (LZ4_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${LZ4_PREFIX}
372+ -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF )
367373
368374 set (LZ4_CONFIGURE SOURCE_SUBDIR "build/cmake" CMAKE_ARGS ${LZ4_CMAKE_ARGS} )
369375 externalproject_add (lz4_ep
@@ -548,6 +554,13 @@ macro(build_avro)
548554
549555 get_target_property (AVRO_ZSTD_INCLUDE_DIR zstd INTERFACE_INCLUDE_DIRECTORIES )
550556 get_filename_component (AVRO_ZSTD_ROOT "${AVRO_ZSTD_INCLUDE_DIR} " DIRECTORY )
557+
558+ get_target_property (AVRO_ZLIB_INCLUDE_DIR zlib INTERFACE_INCLUDE_DIRECTORIES )
559+ get_filename_component (AVRO_ZLIB_ROOT "${AVRO_ZLIB_INCLUDE_DIR} " DIRECTORY )
560+
561+ get_target_property (AVRO_FMT_INCLUDE_DIR fmt INTERFACE_INCLUDE_DIRECTORIES )
562+ get_filename_component (AVRO_FMT_ROOT "${AVRO_FMT_INCLUDE_DIR} " DIRECTORY )
563+
551564 set (AVRO_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -Wno-error" )
552565 set (AVRO_CMAKE_C_FLAGS "${EP_C_FLAGS} -Wno-error" )
553566
@@ -558,7 +571,8 @@ macro(build_avro)
558571 "-DCMAKE_C_FLAGS=${AVRO_CMAKE_C_FLAGS} "
559572 "-DAVRO_BUILD_TESTS=OFF"
560573 "-DAVRO_BUILD_EXECUTABLES=OFF"
561- "-DZLIB_ROOT=${THIRDPARTY_ZLIB_ROOT} "
574+ "-DZLIB_ROOT=${AVRO_ZLIB_ROOT} "
575+ "-Dfmt_ROOT=${AVRO_FMT_ROOT} "
562576 "-Dzstd_ROOT=${AVRO_ZSTD_ROOT} "
563577 "-DSnappy_ROOT=${AVRO_SNAPPY_ROOT} " )
564578 externalproject_add (avro_ep
@@ -567,7 +581,7 @@ macro(build_avro)
567581 SOURCE_SUBDIR "lang/c++"
568582 CMAKE_ARGS ${AVRO_CMAKE_ARGS}
569583 BUILD_BYPRODUCTS "${AVRO_STATIC_LIB} "
570- DEPENDS zlib zstd snappy)
584+ DEPENDS fmt zlib zstd snappy)
571585
572586 file (MAKE_DIRECTORY "${AVRO_INCLUDE_DIR} " )
573587
@@ -693,6 +707,9 @@ macro(build_arrow)
693707 set (ARROW_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -Wno-error" )
694708 set (ARROW_CMAKE_C_FLAGS "${EP_C_FLAGS} -Wno-error" )
695709 string (REPLACE "-Werror" "" ARROW_CMAKE_CXX_FLAGS ${ARROW_CMAKE_CXX_FLAGS} )
710+ # Fix for thrift Mutex.h missing #include <cstdint> (GCC 15 strictness)
711+ # Use -include to force include cstdint for all C++ files
712+ string (APPEND ARROW_CMAKE_CXX_FLAGS " -include cstdint" )
696713
697714 set (ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR} /arrow_ep-install" )
698715 set (ARROW_HOME "${ARROW_PREFIX} " )
@@ -730,6 +747,9 @@ macro(build_arrow)
730747 -DARROW_DEPENDENCY_USE_SHARED=OFF
731748 -DARROW_BUILD_SHARED=OFF
732749 -DARROW_BUILD_STATIC=ON
750+ -DARROW_BUILD_TESTS=OFF
751+ -DARROW_BUILD_BENCHMARKS=OFF
752+ -DARROW_BUILD_EXAMPLES=OFF
733753 -DARROW_JEMALLOC=OFF
734754 -DARROW_WITH_RE2=OFF
735755 -DARROW_WITH_UTF8PROC=OFF
@@ -988,6 +1008,11 @@ macro(build_glog)
9881008 INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT" )
9891009
9901010 add_dependencies (glog glog_ep )
1011+
1012+ find_library (LIBUNWIND_LIBRARY NAMES unwind )
1013+ if (LIBUNWIND_LIBRARY)
1014+ target_link_libraries (glog INTERFACE ${LIBUNWIND_LIBRARY} )
1015+ endif ()
9911016endmacro ()
9921017
9931018build_fmt ()
0 commit comments