Fix protobuf

Gold856 · Jul 9, 2024 · 3d7c9df · 3d7c9df
1 parent 49a3ee1
commit 3d7c9df
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -98,7 +98,7 @@ jobs:
           - os: ubuntu-22.04
             name: Linux
             container: wpilib/roborio-cross-ubuntu:2024-22.04
-            flags: "-DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DBUILD_MAVEN=ON -DCMAKE_INSTALL_PREFIX=~/wpilib -DWITH_GUI=OFF -DJAVA_INCLUDE_PATH=$JAVA_HOME/include -DJAVA_INCLUDE_PATH2=$JAVA_HOME/include -DJAVA_JVM_LIBRARY=$JAVA_HOME/lib/libjvm.so"
+            flags: "-DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DBUILD_MAVEN=ON -DCMAKE_INSTALL_PREFIX=~/wpilib -DWITH_GUI=OFF -DJAVA_INCLUDE_PATH=$JAVA_HOME/include -DJAVA_INCLUDE_PATH2=$JAVA_HOME/include -DJAVA_JVM_LIBRARY=$JAVA_HOME/lib/libjvm.so -DProtobuf_LIBRARIES=/usr/lib/x86_64-linux-gnu -DProtobuf_INCLUDE_DIR=/usr/include"
           - os: macOS-14
             name: macOS
             container: ""
@@ -115,7 +115,7 @@ jobs:
 
       - name: Setup protoc (Linux)
         if: runner.os == 'Linux'
-        run: wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip && unzip protoc-21.12-linux-x86_64.zip && export PATH=$PATH:$(pwd)/bin
+        run: wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip && unzip protoc-21.12-linux-x86_64.zip && export PATH=$PATH:$(pwd)/bin/ && chmod +x $(pwd)/bin/protoc
 
       - name: Install dependencies (macOS)
         run: brew install opencv protobuf@3 ninja