use protobuf_generate instead of protobuf_generate_cpp

rzblue · Nov 3, 2023 · 21e14ff · 21e14ff
1 parent 1c35d42
commit 21e14ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
     set(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION 10.0.18362.0 CACHE STRING INTERNAL FORCE)
 endif()
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.13)
 project(allwpilib)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 

diff --git a/README-CMAKE.md b/README-CMAKE.md
@@ -100,7 +100,7 @@ Using the libraries from C++ is the easiest way to use the built libraries.
 To do so, create a new folder to contain your project. Add the following code below to a `CMakeLists.txt` file in that directory.
 
 ```
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.13)
 project(vision_app) # Project Name Here
 
 find_package(wpilib REQUIRED)

diff --git a/cmake/toolchains/gnu.toolchain.cmake b/cmake/toolchains/gnu.toolchain.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.13)
 
 # load settings in case of "try compile"
 set(TOOLCHAIN_CONFIG_FILE "${WPILIB_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain.config.cmake")

diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt
@@ -6,7 +6,6 @@ include(AddTest)
 include(DownloadAndCheck)
 
 file(GLOB wpimath_proto_src src/main/proto/*.proto)
-protobuf_generate_cpp(WPIMATH_PROTO_SRCS WPIMATH_PROTO_HDRS PROTOC_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/protobuf" PROTOS ${wpimath_proto_src})
 
 function(quickbuf_generate SRCS JAVA_PACKAGE)
   if(NOT ARGN)
@@ -170,7 +169,7 @@ file(GLOB_RECURSE wpimath_native_src src/main/native/cpp/*.cpp)
 list(REMOVE_ITEM wpimath_native_src ${wpimath_jni_src})
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS FALSE)
-add_library(wpimath ${wpimath_native_src} ${WPIMATH_PROTO_SRCS})
+add_library(wpimath ${wpimath_native_src} ${wpimath_proto_src})
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 set_target_properties(wpimath PROPERTIES DEBUG_POSTFIX "d")
 
@@ -184,6 +183,8 @@ endif()
 wpilib_target_warnings(wpimath)
 target_link_libraries(wpimath wpiutil)
 
+protobuf_generate(TARGET wpimath LANGUAGE cpp PROTOC_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/protobuf" APPEND_PATH)
+
 if (NOT USE_SYSTEM_EIGEN)
     install(DIRECTORY src/main/native/thirdparty/eigen/include/ DESTINATION "${include_dest}/wpimath")
     target_include_directories(wpimath SYSTEM PUBLIC