Merge conflicts

mavlink · Aug 19, 2019 · ca7b4bf · ca7b4bf
2 parents dd7f64c + fcbee00
commit ca7b4bf
Show file tree

Hide file tree

Showing 19 changed files with 21,665 additions and 24,838 deletions.
diff --git a/src/backend/src/generated/action/action.pb.cc b/src/backend/src/generated/action/action.pb.cc
diff --git a/src/backend/src/generated/action/action.pb.h b/src/backend/src/generated/action/action.pb.h
diff --git a/src/backend/src/generated/calibration/calibration.pb.cc b/src/backend/src/generated/calibration/calibration.pb.cc
diff --git a/src/backend/src/generated/calibration/calibration.pb.h b/src/backend/src/generated/calibration/calibration.pb.h
diff --git a/src/backend/src/generated/camera/camera.pb.cc b/src/backend/src/generated/camera/camera.pb.cc
diff --git a/src/backend/src/generated/camera/camera.pb.h b/src/backend/src/generated/camera/camera.pb.h
diff --git a/src/backend/src/generated/core/core.pb.cc b/src/backend/src/generated/core/core.pb.cc
diff --git a/src/backend/src/generated/core/core.pb.h b/src/backend/src/generated/core/core.pb.h
diff --git a/src/backend/src/generated/gimbal/gimbal.pb.cc b/src/backend/src/generated/gimbal/gimbal.pb.cc
diff --git a/src/backend/src/generated/gimbal/gimbal.pb.h b/src/backend/src/generated/gimbal/gimbal.pb.h
diff --git a/src/backend/src/generated/info/info.pb.cc b/src/backend/src/generated/info/info.pb.cc
diff --git a/src/backend/src/generated/info/info.pb.h b/src/backend/src/generated/info/info.pb.h
diff --git a/src/backend/src/generated/mission/mission.pb.cc b/src/backend/src/generated/mission/mission.pb.cc
diff --git a/src/backend/src/generated/mission/mission.pb.h b/src/backend/src/generated/mission/mission.pb.h
diff --git a/src/backend/src/generated/offboard/offboard.pb.cc b/src/backend/src/generated/offboard/offboard.pb.cc
diff --git a/src/backend/src/generated/offboard/offboard.pb.h b/src/backend/src/generated/offboard/offboard.pb.h
diff --git a/src/backend/src/generated/param/param.pb.cc b/src/backend/src/generated/param/param.pb.cc
diff --git a/src/backend/src/generated/param/param.pb.h b/src/backend/src/generated/param/param.pb.h
diff --git a/third_party/protobuf/CMakeLists.txt b/third_party/protobuf/CMakeLists.txt
@@ -47,7 +47,9 @@ endif()
 
 ExternalProject_add(
     protobuf
-    URL https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-cpp-3.7.1.tar.gz
+    GIT_REPOSITORY https://github.com/protocolbuffers/protobuf
+    GIT_TAG ee4f2492ea4e7ff120f68a792af870ee30435aa5
+    #URL https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-cpp-3.7.1.tar.gz
     PREFIX protobuf
     CONFIGURE_COMMAND ${CMAKE_COMMAND} "${CMAKE_GENERATOR_PARAM}" "${CMAKE_ARGS}" <SOURCE_DIR>/cmake
     # CMAKE_ARGS + SOURCE_SUBDIR are more elegant than CONFIGURE_COMMAND,