Skip to content

Commit

Permalink
Dependencies: Compatibility with protobuf >= v22.0 (#1155)
Browse files Browse the repository at this point in the history
Plus reactivate newest protobuf version for MacOS GH Actions build
---------

Co-authored-by: Kerstin Keller <KerstinKeller@users.noreply.github.com>
Co-authored-by: Florian Reimold <FlorianReimold@users.noreply.github.com>
  • Loading branch information
3 people committed Aug 7, 2023
1 parent 14fd6bc commit bf4348e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
target: 'desktop'

- name: Install Dependencies
run: brew install ninja doxygen graphviz protobuf@21 hdf5 pkg-config
run: brew install ninja doxygen graphviz protobuf hdf5 pkg-config

- name: Install Cap’n Proto
run: |
Expand Down Expand Up @@ -85,8 +85,8 @@ jobs:
-DECAL_THIRDPARTY_BUILD_QWT=ON \
-DECAL_THIRDPARTY_BUILD_YAML-CPP=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=/usr/local/opt/protobuf@21 \
-DCMAKE_CXX_STANDARD=14 \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
-DPython_FIND_STRATEGY=LOCATION \
-DPython_FIND_REGISTRY=NEVER
sudo mkdir /etc/ecal
Expand Down
4 changes: 2 additions & 2 deletions samples/cpp/services/ping_client_dyn/src/proto_json_conv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ std::string GetSerialzedMessageFromJSON(google::protobuf::Message* msg_proto_, c
}

// read JSON string into message object
google::protobuf::util::Status status = google::protobuf::util::JsonStringToMessage(msg_json_, msg_proto_);
auto status = google::protobuf::util::JsonStringToMessage(msg_json_, msg_proto_);
if (!status.ok())
{
std::cerr << "Could not convert JSON to google message." << std::endl;
Expand All @@ -60,7 +60,7 @@ std::string GetJSONFromSerialzedMessage(google::protobuf::Message* msg_proto_, c

// convert message object to JSON string
std::string msg_json;
google::protobuf::util::Status status = google::protobuf::util::MessageToJsonString(*msg_proto_, &msg_json);
auto status = google::protobuf::util::MessageToJsonString(*msg_proto_, &msg_json);
if (!status.ok())
{
std::cerr << "Could not convert google message to JSON." << std::endl;
Expand Down

0 comments on commit bf4348e

Please sign in to comment.