Skip to content

ARROW-5828: [C++] Add required Protocol Buffers versions check #4785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kou wants to merge 1 commit into from
Closed

ARROW-5828: [C++] Add required Protocol Buffers versions check #4785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,19 @@ macro(resolve_dependency DEPENDENCY_NAME)
endif()
endmacro()

macro(resolve_dependency_with_version DEPENDENCY_NAME REQUIRED_VERSION)
if(${DEPENDENCY_NAME}_SOURCE STREQUAL "AUTO")
find_package(${DEPENDENCY_NAME} ${REQUIRED_VERSION} MODULE)
if(NOT ${${DEPENDENCY_NAME}_FOUND})
build_dependency(${DEPENDENCY_NAME})
endif()
elseif(${DEPENDENCY_NAME}_SOURCE STREQUAL "BUNDLED")
build_dependency(${DEPENDENCY_NAME})
elseif(${DEPENDENCY_NAME}_SOURCE STREQUAL "SYSTEM")
find_package(${DEPENDENCY_NAME} ${REQUIRED_VERSION} REQUIRED)
endif()
endmacro()

# ----------------------------------------------------------------------
# Thirdparty versions, environment variables, source URLs

Expand Down Expand Up @@ -1282,7 +1295,12 @@ macro(build_protobuf)
endmacro()

if(ARROW_WITH_PROTOBUF)
resolve_dependency(Protobuf)
if(ARROW_WITH_GRPC)
set(ARROW_PROTOBUF_REQUIRED_VERSION "3.6.0")
else()
set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1")
endif()
resolve_dependency_with_version(Protobuf ${ARROW_PROTOBUF_REQUIRED_VERSION})

if(ARROW_PROTOBUF_USE_SHARED AND MSVC)
add_definitions(-DPROTOBUF_USE_DLLS)
Expand Down