Skip to content

Commit cfbeebc

Browse files
committed
feat(cli): add rich autocomplete and syntax highlighting
1 parent 5e1ff5e commit cfbeebc

7 files changed

Lines changed: 423 additions & 23 deletions

File tree

cmake/BuildArrowAsThirdParty.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,20 @@ function(build_arrow_as_third_party)
161161
message(STATUS "Patched Arrow ThirdpartyToolchain.cmake for CMake 4.x compatibility")
162162
endif()
163163
endif()
164+
if(APPLE)
165+
set(_build_utils "${arrow_SOURCE_DIR}/cpp/cmake_modules/BuildUtils.cmake")
166+
file(READ "${_build_utils}" _build_utils_content)
167+
string(FIND "${_build_utils_content}" "cctools(_ld)?-" _libtool_already_patched)
168+
if(_libtool_already_patched EQUAL -1)
169+
string(REPLACE
170+
"cctools-([0-9.]+)"
171+
"cctools(_ld)?-([0-9.]+)"
172+
_build_utils_content "${_build_utils_content}")
173+
file(WRITE "${_build_utils}" "${_build_utils_content}")
174+
message(STATUS "Patched Arrow BuildUtils.cmake for Xcode cctools_ld libtool output")
175+
endif()
176+
endif()
177+
164178
# Propagate CMAKE_OSX_ARCHITECTURES into Arrow's bundled ExternalProject
165179
# sub-builds (snappy, zlib, zstd, etc.) so they are compiled for the
166180
# correct target architecture (e.g. arm64 on macos-15 / Apple Silicon).

cmake/BuildBRPCAsThirdParty.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ function(build_brpc_as_third_party)
6666
message(STATUS "Applying warning suppression flags to PROTO_LIB")
6767
target_compile_options(PROTO_LIB PRIVATE -Wno-deprecated-declarations -Wno-nonnull -DDYNAMIC_ANNOTATIONS_ENABLED=0)
6868
endif()
69-
69+
if (TARGET protoc-gen-mcpack AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
70+
target_compile_options(protoc-gen-mcpack PRIVATE -Wno-error=deprecated-builtins)
71+
endif()
72+
7073
set(BRPC_LIB brpc-static PARENT_SCOPE)
7174
set(BRPC_ALL_LIBS brpc-static BUTIL_LIB PROTO_LIB)
7275
foreach(lib ${BRPC_ALL_LIBS})

0 commit comments

Comments
 (0)