Merge c084269 into 51cc67c

mavlink · Aug 12, 2019 · 87a8cf9 · 87a8cf9
2 parents 51cc67c + c084269
commit 87a8cf9
Show file tree

Hide file tree

Showing 47 changed files with 115,904 additions and 45 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,9 @@
 [submodule "gtest"]
 	path = src/third_party/gtest
 	url = https://github.com/google/googletest
-[submodule "dronecore-proto"]
-	path = src/backend/proto
-	url = https://github.com/dronecore/DroneCore-Proto.git
+[submodule "mavsdk-proto"]
+	path = proto
+	url = https://github.com/mavlink/MAVSDK-Proto.git
 [submodule "third_party/cpp_rsc"]
 	path = src/third_party/cpp_rsc
 	url = https://github.com/orex/cpp_rsc.git
diff --git a/src/backend/proto → proto b/src/backend/proto → proto
diff --git a/src/backend/CMakeLists.txt b/src/backend/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
 
-set(PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/proto/protos)
-
 find_package(OpenSSL REQUIRED)
 find_package(gRPC REQUIRED)
 

diff --git a/src/backend/src/CMakeLists.txt b/src/backend/src/CMakeLists.txt
@@ -1,20 +1,21 @@
 cmake_minimum_required(VERSION 3.1)
 
-set(COMPONENTS_LIST core action calibration gimbal camera mission offboard telemetry info param)
-
-include(cmake/compile_proto.cmake)
+set(COMPONENTS_LIST action calibration camera core gimbal info mission offboard param telemetry)
 
 foreach(COMPONENT_NAME ${COMPONENTS_LIST})
-    compile_proto_pb(${COMPONENT_NAME} PB_COMPILED_SOURCE)
-    compile_proto_grpc(${COMPONENT_NAME} GRPC_COMPILED_SOURCE)
-    add_library(${COMPONENT_NAME}_proto_gens STATIC ${GRPC_COMPILED_SOURCE} ${PB_COMPILED_SOURCE})
+    add_library(${COMPONENT_NAME}_proto_gens STATIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/generated/${COMPONENT_NAME}/${COMPONENT_NAME}.grpc.pb.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/generated/${COMPONENT_NAME}/${COMPONENT_NAME}.pb.cc)
+
     target_link_libraries(${COMPONENT_NAME}_proto_gens
         gRPC::grpc++
     )
+
     target_include_directories(${COMPONENT_NAME}_proto_gens
       PRIVATE
-      ${CMAKE_BINARY_DIR}/src/backend/src
+      ${PROJECT_SOURCE_DIR}/backend/src/generated
     )
+
     list(APPEND COMPONENTS_PROTOGENS ${COMPONENT_NAME}_proto_gens)
 endforeach()
 
@@ -60,7 +61,7 @@ target_include_directories(mavsdk_server
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/plugins>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/backend/src/plugins>
     PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src/backend/src>
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/backend/src/generated>
     $<INSTALL_INTERFACE:include>
 )
 

diff --git a/src/backend/src/cmake/compile_proto.cmake b/src/backend/src/cmake/compile_proto.cmake
diff --git a/src/backend/src/generated/action/action.grpc.pb.cc b/src/backend/src/generated/action/action.grpc.pb.cc
diff --git a/src/backend/src/generated/action/action.grpc.pb.h b/src/backend/src/generated/action/action.grpc.pb.h