Skip to content

Commit

Permalink
Set Protobuf to BUNDLED for backward compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
jinchengchenghh committed May 28, 2024
1 parent f904928 commit 26bde5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 5 additions & 0 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ if("${jemalloc_SOURCE}" STREQUAL "")
set(jemalloc_SOURCE "BUNDLED")
endif()

# For backward compatibility. We use bundled Protobuf by default.
if("${Protobuf_SOURCE}" STREQUAL "")
set(Protobuf_SOURCE "BUNDLED")
endif()

message(STATUS "Using ${ARROW_DEPENDENCY_SOURCE} approach to find dependencies")

if(ARROW_DEPENDENCY_SOURCE STREQUAL "CONDA")
Expand Down
4 changes: 1 addition & 3 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1230,9 +1230,7 @@
-DBUILD_TESTING=OFF
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${arrow.dataset.jni.dist.dir}
-DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake
-DProtobuf_USE_STATIC_LIBS=ON
-DProtobuf_ROOT=${project.basedir}/../cpp-jni/protobuf_ep-install</commandlineArgs>
-DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake</commandlineArgs>
<workingDirectory>../</workingDirectory>
</configuration>
</execution>
Expand Down

0 comments on commit 26bde5b

Please sign in to comment.