Add QGC Mission import capability

.gitmodules

@@ -1,19 +1,22 @@
-[submodule "libs/include/mavlink/v2.0"]
+[submodule "mavlink_v2"]
 	path = third_party/mavlink/include/mavlink/v2.0
 	url = https://github.com/mavlink/c_library_v2.git
-[submodule "libs/gtest"]
+[submodule "gtest"]
 	path = third_party/gtest
 	url = https://github.com/google/googletest
 [submodule "curl-android-ios"]
 	path = core/third_party/curl-android-ios
 	url = https://github.com/dronecore/curl-android-ios.git
-[submodule "libs/tinyxml2"]
+[submodule "tinyxml2"]
 	path = core/third_party/tinyxml2
 	url = https://github.com/leethomason/tinyxml2.git
-[submodule "grpc/server/proto"]
+[submodule "dronecore-proto"]
 	path = grpc/server/proto
 	url = https://github.com/dronecore/DroneCore-Proto.git
-[submodule "third_party/zlib"]
+[submodule "zlib"]
 	path = third_party/zlib
 	url = https://github.com/madler/zlib
 	ignore = dirty
+[submodule "json11"]
+	path = plugins/mission/third_party/json11
+	url = https://github.com/dropbox/json11

CMakeLists.txt

@@ -11,8 +11,6 @@ include(cmake/compiler_flags.cmake)
 include(cmake/zlib.cmake)
 include(cmake/curl.cmake)
 
-# We support install in order to use the header and library files in
-# other applications.
 if(ANDROID)
     set(lib_path "lib/android/${ANDROID_ABI}")
 elseif(IOS)
@@ -21,14 +19,12 @@ else()
     set(lib_path "lib")
 endif()
 
-# We want to use consistent install directories across libraries.
 set(dronecore_install_include_dir "include/dronecore")
 set(dronecore_install_lib_dir ${lib_path})
 
 add_subdirectory(core)
 add_subdirectory(plugins)
 
-# Add external plugins.
 if (DEFINED EXTERNAL_DIR AND NOT EXTERNAL_DIR STREQUAL "")
     add_subdirectory(${EXTERNAL_DIR}/plugins
         ${CMAKE_CURRENT_BINARY_DIR}/${EXTERNAL_DIR}/plugins)
@@ -52,6 +48,8 @@ if(NOT IOS AND NOT ANDROID)
         add_subdirectory(${EXTERNAL_DIR}/integration_tests
             ${CMAKE_CURRENT_BINARY_DIR}/${EXTERNAL_DIR}/integration_tests)
     endif()
+
+    include(cmake/unit_tests.cmake)
 endif()
 
 if (DROP_DEBUG EQUAL 1)

Makefile

@@ -142,7 +142,7 @@ run_all_tests: default
 	${MAKE} -C build/default check
 
 run_unit_tests: default
-	build/default/core/unit_tests_runner
+	build/default/unit_tests_runner
 
 run_integration_tests: default
 	build/default/integration_tests/integration_tests_runner

appveyor.yml

@@ -110,15 +110,17 @@ test: on
 test_script:
   - cd C:\dronecore
   - if "%configuration%"=="Debug" (
-      copy build\third_party\gtest\googlemock\gtest\Debug\gtestd.dll build\core\Debug\ &&
-      copy build\third_party\gtest\googlemock\gtest\Debug\gtest_maind.dll build\core\Debug\ &&
-      copy build\third_party\gtest\googlemock\Debug\gmockd.dll build\core\Debug\ &&
-      cd build\core\Debug &&
-      unit_tests_runner.exe
+      copy build\third_party\gtest\googlemock\gtest\Debug\gtestd.dll build\Debug\ &&
+      copy build\third_party\gtest\googlemock\gtest\Debug\gtest_maind.dll build\Debug\ &&
+      copy build\third_party\gtest\googlemock\Debug\gmockd.dll build\Debug\ &&
+      copy build\plugins\mission\Debug\dronecore_mission.dll build\Debug\ &&
+      copy build\plugins\mission\third_party\json11\Debug\json11.dll build\Debug\ &&
+      build\Debug\unit_tests_runner.exe
     ) else (
-      copy build\third_party\gtest\googlemock\gtest\Release\gtest.dll build\core\Release\ &&
-      copy build\third_party\gtest\googlemock\gtest\Release\gtest_main.dll build\core\Release\ &&
-      copy build\third_party\gtest\googlemock\Release\gmock.dll build\core\Release\ &&
-      cd build\core\Release &&
-      unit_tests_runner.exe
+      copy build\third_party\gtest\googlemock\gtest\Release\gtest.dll build\Release\ &&
+      copy build\third_party\gtest\googlemock\gtest\Release\gtest_main.dll build\Release\ &&
+      copy build\third_party\gtest\googlemock\Release\gmock.dll build\Release\ &&
+      copy build\plugins\mission\Release\dronecore_mission.dll build\Release\ &&
+      copy build\plugins\mission\third_party\json11\Release\json11.dll build\Release\ &&
+      build\Release\unit_tests_runner.exe
     )

cmake/unit_tests.cmake

@@ -0,0 +1,31 @@
+include_directories(${CMAKE_SOURCE_DIR}/core)
+include_directories(${CMAKE_SOURCE_DIR}/third_party/mavlink/include)
+include_directories(${CURL_INCLUDE_DIRS})
+
+add_executable(unit_tests_runner
+    ${UNIT_TEST_SOURCES}
+)
+
+if (MSVC)
+    # We need this to prevent linking errors from happening in the Windows build.
+    target_compile_definitions(unit_tests_runner PRIVATE -DGTEST_LINKED_AS_SHARED_LIBRARY)
+    target_compile_options(unit_tests_runner PUBLIC "/wd4251" "/wd4275")
+endif()
+
+target_compile_definitions(unit_tests_runner PRIVATE FAKE_TIME=1)
+
+set_target_properties(unit_tests_runner
+    PROPERTIES COMPILE_FLAGS ${warnings}
+)
+
+target_link_libraries(unit_tests_runner
+    dronecore
+    dronecore_mission
+    gtest
+    gtest_main
+    gmock
+)
+
+add_test(unit_tests
+    unit_tests_runner
+)

core/CMakeLists.txt

@@ -124,44 +124,14 @@ install(FILES
     DESTINATION "include/dronecore"
 )
 
-
-if(NOT IOS AND NOT ANDROID)
-    # SYSTEM because we don't want warnings for gtest headers.
-    include_directories(SYSTEM third_party/gtest/googletest/include)
-    include_directories(SYSTEM third_party/gtest/googlemock/include)
-
-    add_executable(unit_tests_runner
-        global_include_test.cpp
-        mavlink_channels_test.cpp
-        unittests_main.cpp
-        # TODO: add this again
-        #core/http_loader_test.cpp
-        timeout_handler_test.cpp
-        call_every_handler_test.cpp
-        curl_test.cpp
-        ${plugin_unittest_source_files}
-    )
-
-    if (MSVC)
-        # We need this to prevent linking errors from happening in the Windows build.
-        target_compile_definitions(unit_tests_runner PRIVATE -DGTEST_LINKED_AS_SHARED_LIBRARY)
-        target_compile_options(unit_tests_runner PUBLIC "/wd4251" "/wd4275")
-    endif()
-
-    target_compile_definitions(unit_tests_runner PRIVATE FAKE_TIME=1)
-
-    set_target_properties(unit_tests_runner
-        PROPERTIES COMPILE_FLAGS ${warnings}
-    )
-
-    target_link_libraries(unit_tests_runner
-        dronecore
-        gtest
-        gtest_main
-        gmock
-    )
-
-    add_test(unit_tests
-        unit_tests_runner
-    )
-endif()
+list(APPEND UNIT_TEST_SOURCES
+    ${CMAKE_SOURCE_DIR}/core/global_include_test.cpp
+    ${CMAKE_SOURCE_DIR}/core/mavlink_channels_test.cpp
+    ${CMAKE_SOURCE_DIR}/core/unittests_main.cpp
+    # TODO: add this again
+    #${CMAKE_SOURCE_DIR}/core/http_loader_test.cpp
+    ${CMAKE_SOURCE_DIR}/core/timeout_handler_test.cpp
+    ${CMAKE_SOURCE_DIR}/core/call_every_handler_test.cpp
+    ${CMAKE_SOURCE_DIR}/core/curl_test.cpp
+)
+set(UNIT_TEST_SOURCES ${UNIT_TEST_SOURCES} PARENT_SCOPE)