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

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

View File

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

View File

@@ -4,12 +4,14 @@
#include "frc/controller/proto/DifferentialDriveWheelVoltagesProto.h"
#include <wpi/ProtoHelper.h>
#include "controller.pb.h"
google::protobuf::Message* wpi::Protobuf<
frc::DifferentialDriveWheelVoltages>::New(google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<
wpi::proto::ProtobufDifferentialDriveWheelVoltages>(arena);
return wpi::CreateMessage<wpi::proto::ProtobufDifferentialDriveWheelVoltages>(
arena);
}
frc::DifferentialDriveWheelVoltages

View File

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

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(

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,12 +4,14 @@
#include "frc/kinematics/proto/DifferentialDriveKinematicsProto.h"
#include <wpi/ProtoHelper.h>
#include "kinematics.pb.h"
google::protobuf::Message* wpi::Protobuf<frc::DifferentialDriveKinematics>::New(
google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<
wpi::proto::ProtobufDifferentialDriveKinematics>(arena);
return wpi::CreateMessage<wpi::proto::ProtobufDifferentialDriveKinematics>(
arena);
}
frc::DifferentialDriveKinematics

View File

@@ -4,11 +4,13 @@
#include "frc/kinematics/proto/DifferentialDriveWheelPositionsProto.h"
#include <wpi/ProtoHelper.h>
#include "kinematics.pb.h"
google::protobuf::Message* wpi::Protobuf<
frc::DifferentialDriveWheelPositions>::New(google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<
return wpi::CreateMessage<
wpi::proto::ProtobufDifferentialDriveWheelPositions>(arena);
}

View File

@@ -4,12 +4,14 @@
#include "frc/kinematics/proto/DifferentialDriveWheelSpeedsProto.h"
#include <wpi/ProtoHelper.h>
#include "kinematics.pb.h"
google::protobuf::Message* wpi::Protobuf<
frc::DifferentialDriveWheelSpeeds>::New(google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<
wpi::proto::ProtobufDifferentialDriveWheelSpeeds>(arena);
return wpi::CreateMessage<wpi::proto::ProtobufDifferentialDriveWheelSpeeds>(
arena);
}
frc::DifferentialDriveWheelSpeeds

View File

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

View File

@@ -4,12 +4,14 @@
#include "frc/kinematics/proto/MecanumDriveWheelPositionsProto.h"
#include <wpi/ProtoHelper.h>
#include "kinematics.pb.h"
google::protobuf::Message* wpi::Protobuf<frc::MecanumDriveWheelPositions>::New(
google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<
wpi::proto::ProtobufMecanumDriveWheelPositions>(arena);
return wpi::CreateMessage<wpi::proto::ProtobufMecanumDriveWheelPositions>(
arena);
}
frc::MecanumDriveWheelPositions

View File

@@ -4,12 +4,13 @@
#include "frc/kinematics/proto/MecanumDriveWheelSpeedsProto.h"
#include <wpi/ProtoHelper.h>
#include "kinematics.pb.h"
google::protobuf::Message* wpi::Protobuf<frc::MecanumDriveWheelSpeeds>::New(
google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<
wpi::proto::ProtobufMecanumDriveWheelSpeeds>(arena);
return wpi::CreateMessage<wpi::proto::ProtobufMecanumDriveWheelSpeeds>(arena);
}
frc::MecanumDriveWheelSpeeds

View File

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

View File

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

View File

@@ -4,12 +4,13 @@
#include "frc/system/plant/proto/DCMotorProto.h"
#include <wpi/ProtoHelper.h>
#include "plant.pb.h"
google::protobuf::Message* wpi::Protobuf<frc::DCMotor>::New(
google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<wpi::proto::ProtobufDCMotor>(
arena);
return wpi::CreateMessage<wpi::proto::ProtobufDCMotor>(arena);
}
frc::DCMotor wpi::Protobuf<frc::DCMotor>::Unpack(

View File

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

View File

@@ -4,12 +4,13 @@
#include "frc/trajectory/proto/TrajectoryStateProto.h"
#include <wpi/ProtoHelper.h>
#include "trajectory.pb.h"
google::protobuf::Message* wpi::Protobuf<frc::Trajectory::State>::New(
google::protobuf::Arena* arena) {
return google::protobuf::Arena::CreateMessage<
wpi::proto::ProtobufTrajectoryState>(arena);
return wpi::CreateMessage<wpi::proto::ProtobufTrajectoryState>(arena);
}
frc::Trajectory::State wpi::Protobuf<frc::Trajectory::State>::Unpack(