Skip to content

Commit

Permalink
protobuf fix
Browse files Browse the repository at this point in the history
Signed-off-by: swurl <[email protected]>
  • Loading branch information
crueter committed Nov 30, 2023
1 parent 9fe0cd6 commit a6d7523
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
13 changes: 13 additions & 0 deletions .github/patches/Protobuf-Fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in
index ef7ee9d4f..a881a9bf0 100644
--- a/wpiutil/wpiutil-config.cmake.in
+++ b/wpiutil/wpiutil-config.cmake.in
@@ -2,7 +2,7 @@ include(CMakeFindDependencyMacro)
@FILENAME_DEP_REPLACE@
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_dependency(Threads)
-find_dependency(protobuf)
+find_dependency(Protobuf)
@FMTLIB_SYSTEM_REPLACE@

if(@USE_SYSTEM_FMTLIB@)
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
cd allwpilib
git apply ../.github/patches/No-Werror.patch
sed -i 's/protobuf/Protobuf/g' wpiutil/wpiutil-config.cmake.in
git apply ../.github/patches/Protobuf-Fix.patch
cd ..
- name: 'Install Python Dependencies (Linux)'
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
BUILD_WIN_DIR: "winbuild"
INSTALL_WIN_DIR: "install-win"
NTCORE_INSTALL_DIR: "install-ntcore"

steps:
- uses: ilammy/msvc-dev-cmd@v1

Expand Down Expand Up @@ -207,6 +207,7 @@ jobs:
run: |
cd allwpilib
git apply ../.github/patches/No-Werror.patch
git apply ../.github/patches/Protobuf-Fix.patch
cd ..
- name: 'Configure ntcore CMake (Windows)'
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)

project(QFRCDashboard VERSION 0.1 LANGUAGES CXX)

Expand All @@ -9,8 +9,6 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

cmake_policy(SET CMP0074 NEW)

find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets MultimediaWidgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets MultimediaWidgets)
find_package(ntcore REQUIRED)
Expand Down

0 comments on commit a6d7523

Please sign in to comment.