Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Fix CMake protobuf dependency handling (#6772)

Browse Source 
Reverts #6609 since that fix didn't Just Work(tm) on Windows. (edit: or Ubuntu. Seems to have broken everything except macOS.) This PR configures CMake to try and find protobuf-config.cmake first, which allows protobuf to pull in abseil for us. If protobuf-config.cmake is not available (coprocessors which don't have a new enough protobuf installed are a common case), it will fallback to CMake's built-in FindProtobuf module, which is what we were using before.

Add wpi::CreateMessage, a wrapper with an ifdef to switch between Arena::CreateMessage and Arena::Create, since the former is deprecated in newer versions of protobuf. This allows forward compatibility with newer versions of protobuf.
This commit is contained in:
Gold856
2024-06-28 09:28:39 -04:00
committed by GitHub
parent a7173dbd3c
commit 5ce72d43e4
33 changed files with 114 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpimath/src/main/native/cpp/geometry/proto/Ellipse2dProto.cpp
View File

@@ -4,12 +4,13 @@
#include "frc/geometry/proto/Ellipse2dProto.h"
#include <wpi/ProtoHelper.h>
#include "geometry2d.pb.h"
google::protobuf::Message* wpi::Protobuf<frc::Ellipse2d>::New(
google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<wpi::proto::ProtobufEllipse2d>(
arena);
return wpi::CreateMessage<wpi::proto::ProtobufEllipse2d>(arena);
}
frc::Ellipse2d wpi::Protobuf<frc::Ellipse2d>::Unpack(