Fix dependencies when building core as shared libs

mavlink · Jun 4, 2019 · bbe891e · bbe891e
1 parent 4c8b1c1
commit bbe891e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/DronecodeSDKConfig.cmake.in b/DronecodeSDKConfig.cmake.in
@@ -1,13 +1,15 @@
 include(CMakeFindDependencyMacro)
 
-if(${CMAKE_VERSION} VERSION_LESS "3.9.0")
-    find_package(CURL REQUIRED CONFIG)
-else()
-    find_dependency(CURL REQUIRED CONFIG)
-endif()
+if(NOT ${BUILD_SHARED_LIBS})
+    if(${CMAKE_VERSION} VERSION_LESS "3.9.0")
+        find_package(CURL REQUIRED CONFIG)
+    else()
+        find_dependency(CURL REQUIRED CONFIG)
+    endif()
 
-find_dependency(json11)
-find_dependency(tinyxml2)
+    find_dependency(json11)
+    find_dependency(tinyxml2)
+endif()
 
 get_filename_component(DRONECODESDK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include("${DRONECODESDK_CMAKE_DIR}/DronecodeSDKTargets.cmake")
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -31,6 +31,7 @@ add_library(dronecode_sdk
 )
 
 target_link_libraries(dronecode_sdk
+    PRIVATE
     tinyxml2::tinyxml2
     CURL::libcurl
     ${CMAKE_THREAD_LIBS_INIT}

diff --git a/src/plugins/camera/CMakeLists.txt b/src/plugins/camera/CMakeLists.txt
@@ -18,7 +18,9 @@ add_library(dronecode_sdk_camera
 )
 
 target_link_libraries(dronecode_sdk_camera
+    PUBLIC
     dronecode_sdk
+    PRIVATE
     tinyxml2::tinyxml2
     CURL::libcurl
 )