Fix Protobuf dependency for CMake Windows

Gold856 · Jun 9, 2024 · 28b38b7 · 28b38b7
1 parent 72ae751
commit 28b38b7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -216,6 +216,7 @@ endif()
 
 find_package(LIBSSH 0.7.1)
 
+find_package(Protobuf CONFIG REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(APRILTAG_DEP_REPLACE "find_dependency(apriltag)")

diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
@@ -162,11 +162,6 @@ endif()
 wpilib_target_warnings(wpiutil)
 target_link_libraries(wpiutil protobuf::libprotobuf Threads::Threads ${CMAKE_DL_LIBS})
 
-if(Protobuf_VERSION VERSION_GREATER_EQUAL 4)
-    find_package(absl REQUIRED)
-    target_link_libraries(wpiutil absl::spinlock_wait)
-endif()
-
 if(ATOMIC)
     target_link_libraries(wpiutil ${ATOMIC})
 endif()