From c5c51e3f2ff469b05fd8ec9b416f4591225211ef Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Tue, 14 Nov 2023 07:28:08 -0500
Subject: [PATCH] stupid shim

---
 build.gradle                                                | 2 +-
 .../src/main/native/cpp/photonlib/PhotonPipelineResult.cpp  | 2 ++
 .../native/cpp/photonlib/geometry3d.pb.h}                   | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename photon-lib/src/{test/native/cpp/ProtoTest.cpp => main/native/cpp/photonlib/geometry3d.pb.h} (83%)

diff --git a/build.gradle b/build.gradle
index b55f7dd674..9669d4f0e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ allprojects {
 apply from: "versioningHelper.gradle"
 
 ext {
-    wpilibVersion = "2024.1.1-beta-3-21-gd105f9e"
+    wpilibVersion = "2024.1.1-beta-3-22-g0f81296"
     openCVversion = "4.8.0-2"
     joglVersion = "2.4.0-rc-20200307"
     javalinVersion = "5.6.2"
diff --git a/photon-lib/src/main/native/cpp/photonlib/PhotonPipelineResult.cpp b/photon-lib/src/main/native/cpp/photonlib/PhotonPipelineResult.cpp
index 462dd25a90..ab2f309352 100644
--- a/photon-lib/src/main/native/cpp/photonlib/PhotonPipelineResult.cpp
+++ b/photon-lib/src/main/native/cpp/photonlib/PhotonPipelineResult.cpp
@@ -24,6 +24,8 @@
 
 #include "photonlib/PhotonPipelineResult.h"
 
+#include "photon_types.pb.h"
+
 namespace photonlib {
 PhotonPipelineResult::PhotonPipelineResult(
     units::second_t latency, std::span<const PhotonTrackedTarget> targets)
diff --git a/photon-lib/src/test/native/cpp/ProtoTest.cpp b/photon-lib/src/main/native/cpp/photonlib/geometry3d.pb.h
similarity index 83%
rename from photon-lib/src/test/native/cpp/ProtoTest.cpp
rename to photon-lib/src/main/native/cpp/photonlib/geometry3d.pb.h
index 8835e93fcb..2bfe3ddb1d 100644
--- a/photon-lib/src/test/native/cpp/ProtoTest.cpp
+++ b/photon-lib/src/main/native/cpp/photonlib/geometry3d.pb.h
@@ -22,4 +22,8 @@
  * SOFTWARE.
  */
 
-#include "photon_types.pb.h"
+#pragma once
+// So wpilib publishes protbufs here at wpimath/protobuf. but generated code
+// assumes that the protobuf includes are on your include path. So we need this
+// stupid shim
+#include "wpimath/protobuf/geometry3d.pb.h"