Merge pull request #395 from dronecore/fix-mission-example

fly_qgc_mission: link to json11
mavlink · May 17, 2018 · 3c282b5 · 3c282b5
2 parents 52b02ba + be14232
commit 3c282b5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/example/fly_mission/CMakeLists.txt b/example/fly_mission/CMakeLists.txt
@@ -19,5 +19,4 @@ target_link_libraries(fly_mission
     dronecore_action
     dronecore_mission
     dronecore_telemetry
-    json11
 )
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
     SYSTEM ${CMAKE_SOURCE_DIR}/third_party/mavlink/include
 )
 
-if(IOS OR ANDROID OR APPLE)
+if(IOS OR ANDROID)
     set(PLUGIN_LIBRARY_TYPE STATIC)
 else()
     set(PLUGIN_LIBRARY_TYPE SHARED)

diff --git a/plugins/mission/third_party/json11 b/plugins/mission/third_party/json11