Merge pull request #2706 from Ryanf55/configurable-mavlink

Add configurable mavlink repo URL and Hash

Author: julianoes

third_party/CMakeLists.txt

@@ -13,6 +13,11 @@ if (CMAKE_CROSSCOMPILING)
 endif()
 
 if(SUPERBUILD)
+    set(MAVLINK_HASH "d6a7eeaf43319ce6da19a1973ca40180a4210643"
+        CACHE STRING "Hash for the MAVLink Repository")
+    set(MAVLINK_URL "https://github.com/mavlink/mavlink"
+        CACHE STRING "URL for the MAVLink Repository")
+
     build_target(mavlink)
     build_target(libevents)
     build_target(picosha2)

third_party/cmake/build_target.cmake

@@ -23,6 +23,8 @@ function(build_target TARGET_NAME)
             "-DDEPLOYMENT_TARGET=${DEPLOYMENT_TARGET}" # for iOS toolchain
             "-DENABLE_STRICT_TRY_COMPILE=${ENABLE_STRICT_TRY_COMPILE}" # for iOS toolchain
             "-DMAVLINK_DIALECT=${MAVLINK_DIALECT}"
+            "-DMAVLINK_URL=${MAVLINK_URL}"
+            "-DMAVLINK_HASH=${MAVLINK_HASH}"
             "${TARGET_SOURCE_DIR}"
         WORKING_DIRECTORY "${TARGET_BINARY_DIR}"
         RESULT_VARIABLE CONFIGURE_FAILED

third_party/mavlink/CMakeLists.txt

@@ -14,8 +14,8 @@ set(MAVLINK_GIT_HASH d6a7eeaf43319ce6da19a1973ca40180a4210643)
 if(IOS)
     ExternalProject_add(
         mavlink
-        GIT_REPOSITORY https://github.com/mavlink/mavlink
-        GIT_TAG ${MAVLINK_GIT_HASH}
+        GIT_REPOSITORY "${MAVLINK_URL}"
+        GIT_TAG "${MAVLINK_HASH}"
         PREFIX mavlink
         PATCH_COMMAND git checkout .
         COMMAND git apply ${PROJECT_SOURCE_DIR}/mavlink.patch
@@ -31,8 +31,8 @@ if(IOS)
 else()
     ExternalProject_add(
         mavlink
-        GIT_REPOSITORY https://github.com/mavlink/mavlink
-        GIT_TAG ${MAVLINK_GIT_HASH}
+        GIT_REPOSITORY "${MAVLINK_URL}"
+        GIT_TAG "${MAVLINK_HASH}"
         PREFIX mavlink
         PATCH_COMMAND git checkout . && git apply ${PROJECT_SOURCE_DIR}/mavlink.patch
         CMAKE_ARGS "${CMAKE_ARGS}"