Skip to content
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

[fix] do not override PPLNN_DEP_PROTOBUF_VERSION so that we can use… #936

Merged
merged 1 commit into from
May 16, 2024
Merged

[fix] do not override PPLNN_DEP_PROTOBUF_VERSION so that we can use… #936

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
10 changes: 7 additions & 3 deletions cmake/deps.cmake
View file
Open in desktop
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
Loading