IM TIRED

Signed-off-by: swurl <[email protected]>
Q-FRC · Mar 5, 2025 · cb9c23d · cb9c23d
1 parent 2f87ec8
commit cb9c23d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,6 +101,13 @@ jobs:
       with:
         nsis-version: 3.09
 
+    - name: Install Protobuf
+      uses: ConorMacBride/install-package@v1
+        with:
+          brew: protobuf
+          choco: protoc
+          apt: protobuf-compiler
+
     - name: Install Qt
       uses: jdpurcell/install-qt-action@v4
       with:

diff --git a/3rd_party/CMakeLists.txt b/3rd_party/CMakeLists.txt
@@ -6,24 +6,6 @@ set(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
 
 set(FETCHCONTENT_QUIET OFF)
 
-# protobuf
-if (NOT USE_SYSTEM_PROTOBUF)
-    set(protobuf_ALLOW_CCACHE ON)
-    set(protobuf_MSVC_STATIC_RUNTIME OFF)
-    set(protobuf_BUILD_SHARED_LIBS ON)
-    set(protobuf_BUILD_TESTS OFF)
-    set(ABSL_PROPAGATE_CXX_STD ON)
-
-    set(ABSL_ENABLE_INSTALL ON)
-    FetchContent_Declare(protobuf
-      GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git
-      GIT_TAG        v25.6
-      SOURCE_SUBDIR  cmake
-      FIND_PACKAGE_ARGS NAMES Protobuf
-    )
-    FetchContent_MakeAvailable(Protobuf)
-endif()
-
 # WPILib
 if (NOT USE_SYSTEM_NTCORE)
     set(USE_SYSTEM_EIGEN OFF)