Skip to content

Commit

Permalink
[fix] do not override PPLNN_DEP_PROTOBUF_VERSION so that we can use…
Browse files Browse the repository at this point in the history
… the builtin *.pb.* files
  • Loading branch information
ouonline committed May 16, 2024
1 parent 7673eff commit 762a359
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions cmake/deps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,10 @@ if(MSVC)
endif()
endif()

if(NOT PPLNN_DEP_PROTOBUF_VERSION)
set(PPLNN_DEP_PROTOBUF_VERSION v3.1.0)
if(PPLNN_DEP_PROTOBUF_VERSION)
set(__PROTOBUF_TAG__ ${PPLNN_DEP_PROTOBUF_VERSION})
else()
set(__PROTOBUF_TAG__ v3.1.0)
endif()

if(PPLNN_DEP_PROTOBUF_PKG)
Expand All @@ -170,9 +172,11 @@ else()
endif()
hpcc_declare_git_dep_depth1(protobuf
${PPLNN_DEP_PROTOBUF_GIT}
${PPLNN_DEP_PROTOBUF_VERSION})
${__PROTOBUF_TAG__})
endif()

unset(__PROTOBUF_TAG__)

# --------------------------------------------------------------------------- #

set(RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "disable rapidjson tests")
Expand Down

0 comments on commit 762a359

Please sign in to comment.