stupid shim

PhotonVision · Nov 14, 2023 · c5c51e3 · c5c51e3
1 parent 8bdb5b2
commit c5c51e3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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 → ...main/native/cpp/photonlib/geometry3d.pb.h b/photon-lib/src/test/native/cpp/ProtoTest.cpp → ...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"