diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake index 8bd014ab..3f07104d 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake @@ -249,8 +249,12 @@ macro(build_fmt) string(REPLACE "-Werror" "" FMT_CMAKE_CXX_FLAGS ${FMT_CMAKE_CXX_FLAGS}) set(FMT_CMAKE_ARGS - ${EP_COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FMT_PREFIX} - "-DCMAKE_CXX_FLAGS=${FMT_CMAKE_CXX_FLAGS}" "-DCMAKE_C_FLAGS=${FMT_CMAKE_C_FLAGS}") + ${EP_COMMON_CMAKE_ARGS} + -DCMAKE_INSTALL_PREFIX=${FMT_PREFIX} + "-DCMAKE_CXX_FLAGS=${FMT_CMAKE_CXX_FLAGS}" + "-DCMAKE_C_FLAGS=${FMT_CMAKE_C_FLAGS}" + -DFMT_TEST=OFF + -DFMT_DOC=OFF) set(FMT_CONFIGURE CMAKE_ARGS ${FMT_CMAKE_ARGS}) externalproject_add(fmt_ep URL ${FMT_SOURCE_URL} @@ -337,7 +341,8 @@ macro(build_zstd) -DCMAKE_INSTALL_PREFIX=${ZSTD_PREFIX} "-DCMAKE_CXX_FLAGS=${ZSTD_CMAKE_CXX_FLAGS}" "-DCMAKE_C_FLAGS=${ZSTD_CMAKE_C_FLAGS}" - -DZSTD_BUILD_SHARED=OFF) + -DZSTD_BUILD_SHARED=OFF + -DZSTD_BUILD_PROGRAMS=OFF) set(ZSTD_CONFIGURE SOURCE_SUBDIR "build/cmake" CMAKE_ARGS ${ZSTD_CMAKE_ARGS}) externalproject_add(zstd_ep @@ -363,7 +368,8 @@ macro(build_lz4) "${LZ4_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lz4${CMAKE_STATIC_LIBRARY_SUFFIX}" ) set(LZ4_LIBRARIES ${LZ4_STATIC_LIB}) - set(LZ4_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${LZ4_PREFIX}) + set(LZ4_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${LZ4_PREFIX} + -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF) set(LZ4_CONFIGURE SOURCE_SUBDIR "build/cmake" CMAKE_ARGS ${LZ4_CMAKE_ARGS}) externalproject_add(lz4_ep @@ -701,6 +707,9 @@ macro(build_arrow) set(ARROW_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -Wno-error") set(ARROW_CMAKE_C_FLAGS "${EP_C_FLAGS} -Wno-error") string(REPLACE "-Werror" "" ARROW_CMAKE_CXX_FLAGS ${ARROW_CMAKE_CXX_FLAGS}) + # Fix for thrift Mutex.h missing #include (GCC 15 strictness) + # Use -include to force include cstdint for all C++ files + string(APPEND ARROW_CMAKE_CXX_FLAGS " -include cstdint") set(ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-install") set(ARROW_HOME "${ARROW_PREFIX}") @@ -738,6 +747,9 @@ macro(build_arrow) -DARROW_DEPENDENCY_USE_SHARED=OFF -DARROW_BUILD_SHARED=OFF -DARROW_BUILD_STATIC=ON + -DARROW_BUILD_TESTS=OFF + -DARROW_BUILD_BENCHMARKS=OFF + -DARROW_BUILD_EXAMPLES=OFF -DARROW_JEMALLOC=OFF -DARROW_WITH_RE2=OFF -DARROW_WITH_UTF8PROC=OFF